From 6dc73ea9c08eaeb5b5fdec12f9edc5fe3c93943f Mon Sep 17 00:00:00 2001
From: dulingling <dll19920503@qq.com>
Date: Fri, 10 Jul 2020 14:25:14 +0800
Subject: [PATCH] =?UTF-8?q?upd:=E4=BB=A3=E7=90=86=E5=95=86cbbank=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                                                   | 2 +-
 .../ui/static/config/organizations/templates/new_org.html | 8 ++++----
 .../static/config/organizations/templates/org_detail.html | 8 ++++----
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/pom.xml b/pom.xml
index df5c48dfa..6d7d8c3bc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>manage</artifactId>
-    <version>2.3.35</version>
+    <version>2.3.37</version>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <jib-maven-plugin.version>2.3.0</jib-maven-plugin.version>
diff --git a/src/main/ui/static/config/organizations/templates/new_org.html b/src/main/ui/static/config/organizations/templates/new_org.html
index 7dabe42d0..f3c301de7 100644
--- a/src/main/ui/static/config/organizations/templates/new_org.html
+++ b/src/main/ui/static/config/organizations/templates/new_org.html
@@ -156,12 +156,12 @@
                             </div>
                             <div class="form-group"
                                  ng-class="{'has-error':org_form.cb_bankpay_rate_value.$invalid && org_form.cb_bankpay_rate_value.$dirty}">
-                                <label class="control-label col-sm-2" for="cb_bankpay_rate_value_input">CB BankPay Rate *</label>
+                                <label class="control-label col-sm-2" for="cb_bankpay_rate_value_input">CB BankPay Rate</label>
                                 <div class="col-sm-8">
                                     <div class="input-group">
                                         <input class="form-control" type="number" ng-model="org.cb_bankpay_rate_value"
                                                id="cb_bankpay_rate_value_input" name="cb_bankpay_rate_value"
-                                               max="100" min="0" required>
+                                               max="100" min="0">
                                         <span class="input-group-addon">%</span>
                                     </div>
                                 </div>
@@ -196,7 +196,7 @@
                             <!-- 卡支付-国际卡费率配置 -->
                             <div class="form-group"
                                  ng-class="{'has-error':org_form.rpaypmt_overseas_card_rate_value.$invalid && org_form.rpaypmt_overseas_card_rate_value.$dirty}">
-                                <label class="control-label col-sm-2" for="rpaypmt_overseas_card_rate_value_input">Overseas Card Payment Rate *</label>
+                                <label class="control-label col-sm-2" for="rpaypmt_overseas_card_rate_value_input">International Card Payment Rate *</label>
                                 <div class="col-sm-8">
                                     <div class="input-group">
                                         <input class="form-control" type="number" ng-model="org.rpaypmt_overseas_card_rate_value"
@@ -298,7 +298,7 @@
                             <!-- 卡支付-国内卡最小费率配置 -->
                             <div class="form-group"
                                  ng-class="{'has-error':org_form.min_rpaypmt_overseas_card_rate.$invalid && org_form.min_rpaypmt_overseas_card_rate.$dirty}">
-                                <label class="control-label col-sm-2" for="min_rpaypmt_overseas_card_rate_input">Min Overseas Card Payment Rate</label>
+                                <label class="control-label col-sm-2" for="min_rpaypmt_overseas_card_rate_input">Min International Card Payment Rate</label>
                                 <div class="col-sm-8">
                                     <div class="input-group">
                                         <input class="form-control" type="number" ng-model="org.min_rpaypmt_overseas_card_rate"
diff --git a/src/main/ui/static/config/organizations/templates/org_detail.html b/src/main/ui/static/config/organizations/templates/org_detail.html
index 9e004fd27..8a20e7bdf 100644
--- a/src/main/ui/static/config/organizations/templates/org_detail.html
+++ b/src/main/ui/static/config/organizations/templates/org_detail.html
@@ -137,9 +137,9 @@
                                         </div>
                                     </div>
                                     <div class="form-group" ng-class="{'has-error':org_form.cb_bankpay_rate_value.$invalid && org_form.cb_bankpay_rate_value.$dirty}">
-                                        <label class="control-label col-sm-2" for="cb_bankpay_rate_value_input">CB BankPay Rate *</label>
+                                        <label class="control-label col-sm-2" for="cb_bankpay_rate_value_input">CB BankPay Rate</label>
                                         <div class="col-sm-8">
-                                            <input class="form-control form-control-float" type="number" ng-model="org.cb_bankpay_rate_value" id="cb_bankpay_rate_value_input" name="cb_bankpay_rate_value" max="100" min="0" required>
+                                            <input class="form-control form-control-float" type="number" ng-model="org.cb_bankpay_rate_value" id="cb_bankpay_rate_value_input" name="cb_bankpay_rate_value" max="100" min="0">
                                             <span class="input-group-addon form-control-span">%</span>
                                         </div>
                                     </div>
@@ -162,7 +162,7 @@
 
                                     <!-- 卡支付-国际卡费率配置 -->
                                     <div class="form-group" ng-class="{'has-error':org_form.rpaypmt_overseas_card_rate_value.$invalid && org_form.rpaypmt_overseas_card_rate_value.$dirty}">
-                                        <label class="control-label col-sm-2" for="rpaypmt_overseas_card_rate_value_input">Overseas Card Payment Rate *</label>
+                                        <label class="control-label col-sm-2" for="rpaypmt_overseas_card_rate_value_input">International Card Payment Rate *</label>
                                         <div class="col-sm-8">
                                             <input class="form-control form-control-float" type="number" ng-model="org.rpaypmt_overseas_card_rate_value" id="rpaypmt_overseas_card_rate_value_input" name="rpaypmt_card_rate_value" max="100" min="0" required>
                                             <span class="input-group-addon form-control-span">%</span>
@@ -241,7 +241,7 @@
                                     <!-- 卡支付-国内卡最小费率配置 -->
                                     <div class="form-group"
                                          ng-class="{'has-error':org_form.min_rpaypmt_overseas_card_rate.$invalid && org_form.min_rpaypmt_overseas_card_rate.$dirty}">
-                                        <label class="control-label col-sm-2" for="min_rpaypmt_overseas_card_rate_input">Min Overseas Card Payment Rate</label>
+                                        <label class="control-label col-sm-2" for="min_rpaypmt_overseas_card_rate_input">Min International Card Payment Rate</label>
                                         <div class="col-sm-8">
                                             <input class="form-control form-control-float" type="number" ng-model="org.min_rpaypmt_overseas_card_rate"
                                                    id="min_rpaypmt_overseas_card_rate_input" name="min_rpaypmt_overseas_card_rate" max="100" min="0">