Merge branch 'develop'

src/main/ui/static/payment/partner/templates/sub_partners.html

@@ -1,9 +1,10 @@
 <div class="panel panel-default" ng-if="'111'|withRole">
 
-    <div class="panel-body" ng-if="('10'|withRole) && partner.parent_client_id==null">
-        <div class="panel-body" title="开启后，父商户具有帮子商户新建账户、退款等管理权限">
+    <div class="panel-body pull-right" ng-if="('10'|withRole) && partner.parent_client_id==null">
+        <div class="panel-body">
             Sub Partners Manage <input type="checkbox" ng-model="paymentInfo.sub_manage" bs-switch switch-change="switchSubManage()">
         </div>
+        <a>开启后，父商户具有帮子商户新建账户、退款等管理权限</a>
     </div>
 
     <div class="panel-body">