diff --git a/Application/Admin/Controller/PaymentMerchantController.class.php b/Application/Admin/Controller/PaymentMerchantController.class.php index ebb8baa29..7a546696b 100644 --- a/Application/Admin/Controller/PaymentMerchantController.class.php +++ b/Application/Admin/Controller/PaymentMerchantController.class.php @@ -181,6 +181,7 @@ class PaymentMerchantController extends ThinkController $config = I('config', []); $ways = I('ways', []); $mainId = I('main_id', 0); + $isMaster = I('is_master', 0); if ($name == '') { $this->ajaxReturn([ @@ -230,6 +231,7 @@ class PaymentMerchantController extends ThinkController $data['update_time'] = time(); $data['main_name'] = $mainName; $data['main_id'] = $mainId; + $data['is_master'] = $isMaster; if ($id == 0) { $data['create_time'] = time(); $data['channel'] = $channel; diff --git a/Application/Admin/View/PaymentMerchant/form.html b/Application/Admin/View/PaymentMerchant/form.html index 07f05a191..b821e4c91 100644 --- a/Application/Admin/View/PaymentMerchant/form.html +++ b/Application/Admin/View/PaymentMerchant/form.html @@ -115,8 +115,8 @@ *启用状态 - - + + @@ -133,6 +133,16 @@ + + *是否公户 + + + + + + + +