update

admin/control/merchant.php

@@ -163,6 +163,8 @@ class merchantControl extends SystemControl
                 $result[$mchid] = $data;
             }
             wcache('order_limit' , ['data' => serialize($result)] , 'merchant-');
+            Model('')->table('setting')->where(['name'=>'order_limit'])->delete();
+            Model('')->table('setting')->insert(['name'=>'order_limit','value'=>serialize($result)]);
             showMessage('编辑成功', 'index.php?act=merchant&op=merchant');
         }
         $order_limit = rcache('order_limit' , 'merchant-');

mobile/control/merchant_info.php

@@ -12,7 +12,7 @@ class merchant_infoControl extends mbMerchantControl
     {
         $mchid = $this->mchid();
         $model_merchant = Model('merchant');
-        $merchant_info = $model_merchant->getMerchantInfo(['mchid' => $mchid], 'mchid,admin_id,name,alarm_amount,ip_white_list,use_key,contact_name,contact_phone,warning_phone');
+        $merchant_info = $model_merchant->getMerchantInfo(['mchid' => $mchid], 'mchid,admin_id,name,alarm_amount,ip_white_list,use_key,contact_name,contact_phone,warning_phone,company_name');
         $model_member = Model('member');
         $member_info = $model_member->getMemberInfo(['member_id' => $merchant_info['admin_id']], 'available_predeposit');
         if (empty($member_info)) {
@@ -42,7 +42,7 @@ class merchant_infoControl extends mbMerchantControl
     {
         $mchid = $this->mchid();
         $model_merchant = Model('merchant');
-        $merchant_info = $model_merchant->getMerchantInfo(['mchid' => $mchid], 'mchid,admin_id,name');
+        $merchant_info = $model_merchant->getMerchantInfo(['mchid' => $mchid], 'mchid,admin_id,name,company_name');
         $model_member = Model('member');
         $member_info = $model_member->getMemberInfo(['member_id' => $merchant_info['admin_id']], 'available_predeposit');
         if (empty($member_info)) {