From 76d9b65b73d292329560b54f743babc7aa4806e1 Mon Sep 17 00:00:00 2001
From: yuan <1551130722@qq.com>
Date: Sat, 28 Apr 2018 11:01:57 +0800
Subject: [PATCH] fix html

---
 .../payment/manage/merchants/web/PartnerManageController.java   | 2 +-
 .../static/payment/partner/templates/partner_payment_info.html  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/au/com/royalpay/payment/manage/merchants/web/PartnerManageController.java b/src/main/java/au/com/royalpay/payment/manage/merchants/web/PartnerManageController.java
index 82e279ffd..37764d970 100644
--- a/src/main/java/au/com/royalpay/payment/manage/merchants/web/PartnerManageController.java
+++ b/src/main/java/au/com/royalpay/payment/manage/merchants/web/PartnerManageController.java
@@ -233,7 +233,7 @@ public class PartnerManageController {
         clientManager.refusePartner(clientMoniker, manager, refuse.getString("refuse_remark"));
     }
 
-    @ManagerMapping(value = "/{clientMoniker}/common_sub_merchant_id", method = RequestMethod.PUT, role = {ManagerRole.OPERATOR, ManagerRole.BD_USER})
+    @ManagerMapping(value = "/{clientMoniker}/common_sub_merchant_id", method = RequestMethod.PUT, role = {ManagerRole.OPERATOR})
     public void switchCommonSubMerchantId(@PathVariable String clientMoniker, @RequestBody JSONObject pass, @ModelAttribute(CommonConsts.MANAGER_STATUS) JSONObject manager) {
         clientManager.switchPermission(manager, clientMoniker, "common_sub_merchant_id", pass.getBooleanValue("allow"));
     }
diff --git a/src/main/ui/static/payment/partner/templates/partner_payment_info.html b/src/main/ui/static/payment/partner/templates/partner_payment_info.html
index 773472220..7e792cbc9 100644
--- a/src/main/ui/static/payment/partner/templates/partner_payment_info.html
+++ b/src/main/ui/static/payment/partner/templates/partner_payment_info.html
@@ -39,7 +39,7 @@
                             </div>
                         </div>
                     </div>
-                    <div class="form-group">
+                    <div class="form-group" ng-if="'10'|withRole">
                         <label class="col-sm-3 control-label">Common Sub Merchant Id</label>
                         <div class="col-xs-9">
                             <input type="checkbox" ng-model="paymentInfo.common_sub_merchant_id" bs-switch switch-change="switchCommonSubMerchantId()">