diff --git a/third_party/phpcommon b/third_party/phpcommon index 0fad7e8..2ca4273 160000 --- a/third_party/phpcommon +++ b/third_party/phpcommon @@ -1 +1 @@ -Subproject commit 0fad7e8fc4d878dcf0a1fb61c585027555748fcf +Subproject commit 2ca4273f80ca9a19ddd282e331229ea1b853d372 diff --git a/webapp/classes/RechargeActInfo.php b/webapp/classes/RechargeActInfo.php index f74c769..ac418d2 100644 --- a/webapp/classes/RechargeActInfo.php +++ b/webapp/classes/RechargeActInfo.php @@ -302,7 +302,7 @@ class RechargeActInfo { 'reward' => $shop_info, 'time' => time(), 'isopen' => 0, - 'shop_type' => $shop_type, + 'shop_type' => $act['type'], 'act' => $act, )); } else {