Merge branch 'feature/add_item_other' of wmtx/platform into release

外团特殊比例功能提交

Application/Admin/Controller/CompanyGameRatioController.class.php

@@ -605,7 +605,7 @@ class CompanyGameRatioController extends AdminController
 
             $promote_data = M("promote_company","tab_")->where(['id'=>$save['company_id']])->find();
 
-            if ($promote_data['company_belong'] != '1' && $promote_data['company_belong'] != '2' ) {
+            if ($promote_data['company_belong'] != '1' && $promote_data['company_belong'] != '2') {
                 $save['verify_log'] = json_decode($save['verify_log'],true);
                 $save['verify_log']['market_user']="AUTO";
                 $save['verify_log']['market_time']=date("Y-m-d H:i:s");
@@ -668,7 +668,7 @@ class CompanyGameRatioController extends AdminController
             $save['end_time'] = $params['end_time'] ? strtotime($params['end_time'])+86399 : 0;
             $save['remark'] = $params['remark'] ?? '';
             $save['turnover_type'] = $params['turnover_type'] ?? 1;
-            $save['status'] = 0;
+//            $save['status'] = 0;
             $save['verify_log']=json_encode(["create_user"=>$this->admininfo["username"],"create_time"=>date("Y-m-d H:i:s")]);
 
             if($y['ratio'] != $save['ratio'] || $y['turnover_ratio'] != $save['turnover_ratio'] || $y['begin_time'] != $save['begin_time'] || $y['end_time'] != $save['end_time']){