Просмотр исходного кода

Merge branch 'master' of https://gitee.com/ZhongBangKeJi/CRMEB

liaofei 3 лет назад
Родитель
Сommit
cf179bebfa

+ 0 - 1
.gitignore

@@ -7,7 +7,6 @@
 /crmeb/runtime/session
 /crmeb/runtime/temp
 /crmeb/public/uploads
-/crmeb/app/adminapi/controller/UpgradeController.php
 /crmeb/app/adminapi/controller/v1/statistic/BalanceStatistic.php
 /crmeb/app/adminapi/controller/v1/statistic/OrderStatistic.php
 /crmeb/app/adminapi/controller/v1/statistic/ProductStatistic.php

Разница между файлами не показана из-за своего большого размера
+ 4766 - 0
crmeb/app/adminapi/controller/UpgradeController.php


+ 1 - 1
crmeb/app/services/user/UserServices.php

@@ -1512,7 +1512,7 @@ class UserServices extends BaseServices
         $user['extract_type'] = sys_config('extract_type');
         $user['integral'] = intval($user['integral']);
         $user['is_agent_level'] = $agentLevelServices->count(['status' => 1, 'is_del' => 0]) > 0 ? 1 : 0;
-        $user['division_open'] = (int)sys_config('division_status', 1);
+        $user['division_open'] = (int)sys_config('division_status', 0);
         $user['avatar'] = strpos($user['avatar'], '/statics/system_images/') !== false ? set_file_url($user['avatar']) : $user['avatar'];
         return $user;
     }