From 60fcfd486753b65da9ca812ffac5222a08ad1b97 Mon Sep 17 00:00:00 2001 From: wangwei01 Date: Thu, 22 Aug 2019 20:00:01 +0800 Subject: [PATCH] 1 --- third_party/phpcommon | 2 +- webapp/controller/PassController.class.php | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/third_party/phpcommon b/third_party/phpcommon index 7ecf558..1e3bb4d 160000 --- a/third_party/phpcommon +++ b/third_party/phpcommon @@ -1 +1 @@ -Subproject commit 7ecf558df93a2656631782e76c6d35697da72808 +Subproject commit 1e3bb4df855f6d11df75545d10b0c2aacea34a06 diff --git a/webapp/controller/PassController.class.php b/webapp/controller/PassController.class.php index da6218e..69e3795 100644 --- a/webapp/controller/PassController.class.php +++ b/webapp/controller/PassController.class.php @@ -52,7 +52,6 @@ class PassController{ 'point' => $seaReward_meta['point'], 'active' => $seaReward_meta['reward1'], 'honor' => $seaReward_meta['reward2'], - 'season' => $seaReward_meta['reward3'] ); return $seaReward; }