Merge branch 'master' into redesign‌-260706

app-ghs/controllers/AuthController.php

@@ -919,7 +919,7 @@ class AuthController extends PublicController
     {
         $version = getenv('GHS_NEW_APK_VERSION') == false ? '100' : getenv('GHS_NEW_APK_VERSION');
         $mustUpdate = getenv('GHS_NEW_APK_VERSION_MUST_UPDATE') == false ? 0 : getenv('GHS_NEW_APK_VERSION_MUST_UPDATE');
-        $updateText = '零售系统上线升级';
+        $updateText = '挂账结清后，支持售后了';
         util::success(['version' => $version, 'mustUpdate' => $mustUpdate, 'updateText' => $updateText]);
     }
 

biz-ghs/stat/classes/StatSaleClass.php

@@ -463,7 +463,7 @@ class StatSaleClass extends BaseClass
             ['name' => '零售', 'id' => 'ls', 'amount' => floatval($lsIncome)],
             ['name' => '调拨出库', 'id' => 'allot', 'amount' => floatval($stockOut)],
             // 采购隔天售后冲回（含退货并退款、仅退款）；后续若细分再拆行
-            ['name' => '采购隔天退款', 'id' => 'cgNextDay', 'amount' => floatval($cgNextDayRefund)],
+            ['name' => '采购退款', 'id' => 'cgNextDay', 'amount' => floatval($cgNextDayRefund)],
         ];
         $expend = [
             ['name' => '批发运费', 'id' => 'pfSendCost', 'amount' => floatval($pfSendCost)],