From 6a013b78312b908ed7cfe7628a3ff33a88c6180c Mon Sep 17 00:00:00 2001
From: dalong306 <304592994@qq.com>
Date: Wed, 27 Jan 2021 11:55:56 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E7=94=B3=E8=AF=B7=E5=BE=AE=E4=BF=A1?=
 =?UTF-8?q?=E5=AD=90=E5=95=86=E6=88=B7=E5=8F=B7=20=E5=AD=97=E6=95=B0?=
 =?UTF-8?q?=E9=99=90=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../templates/new_apply_wx_sub_merchant_id.html    | 14 ++++++++------
 .../templates/update_apply_wx_sub_merchant_id.html |  6 +++---
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/src/main/ui/static/payment/partner/templates/new_apply_wx_sub_merchant_id.html b/src/main/ui/static/payment/partner/templates/new_apply_wx_sub_merchant_id.html
index bb1789c49..de2ec9660 100644
--- a/src/main/ui/static/payment/partner/templates/new_apply_wx_sub_merchant_id.html
+++ b/src/main/ui/static/payment/partner/templates/new_apply_wx_sub_merchant_id.html
@@ -43,10 +43,10 @@
                                 <label class="control-label col-sm-3" for="merchant_storename_input">* Merchant Short Name</label>
                                 <div class="col-sm-8">
                                     <input class="form-control" ng-model="subMerchantInfo.short_name"
-                                           type="text" name="merchant_storename" id="merchant_storename_input" required maxlength="50">
+                                           type="text" name="merchant_storename" id="merchant_storename_input" required maxlength="20">
                                     <div ng-messages="subForm.merchant_storename.$error" ng-if="subForm.merchant_storename.$dirty">
                                         <p class="small text-danger" ng-message="required">Required Field</p>
-                                        <p class="small text-danger" ng-message="maxlength">Length is more than 50</p>
+                                        <p class="small text-danger" ng-message="maxlength">Length is more than 20</p>
                                     </div>
                                 </div>
                             </div>
@@ -92,7 +92,7 @@
                                 <label class="control-label col-sm-3" for="website_input">* Website</label>
                                 <div class="col-sm-8">
                                     <input class="form-control" ng-model="subMerchantInfo.company_website"
-                                           type="url" name="company_website" id="website_input" required maxlength="128">
+                                           type="url" name="company_website" id="website_input" required maxlength="100">
                                     <p class="small " >( Not required when   business type is Offline scenario)</p>
 
                                     <div ng-messages="subForm.company_website.$error" ng-if="subForm.company_website.$dirty">
@@ -122,10 +122,12 @@
                                  ng-class="{'has-error':subForm.office_phone.$invalid && subForm.office_phone.$dirty}">
                                 <label class="control-label col-sm-3" for="office_phone_input">* Office Phone</label>
                                 <div class="col-sm-8">
-                                    <input class="form-control" ng-model="subMerchantInfo.company_phone"
+                                    <input class="form-control" ng-model="subMerchantInfo.company_phone" maxlength="20"
                                            type="tel" name="office_phone" id="office_phone_input" required>
                                     <div ng-messages="subForm.office_phone.$error" ng-if="subForm.office_phone.$dirty">
                                         <p class="small text-danger" ng-message="required">Required Field</p>
+                                        <p class="small text-danger" ng-message="maxlength">Length is more than 20</p>
+
                                     </div>
                                 </div>
 
@@ -162,10 +164,10 @@
                                 <label class="control-label col-sm-3" for="contact_email_input">* Contact Email</label>
                                 <div class="col-sm-8">
                                     <input class="form-control" ng-model="subMerchantInfo.contact_email"
-                                           type="text" name="contact_email" id="contact_email_input" required maxlength="128">
+                                           type="text" name="contact_email" id="contact_email_input" required maxlength="50">
                                     <div ng-messages="subForm.contact_email.$error" ng-if="subForm.contact_email.$dirty">
                                         <p class="small text-danger" ng-message="required">Required Field</p>
-                                        <p class="small text-danger" ng-message="maxlength">Length is more than 128</p>
+                                        <p class="small text-danger" ng-message="maxlength">Length is more than 50</p>
                                     </div>
                                 </div>
                             </div>
diff --git a/src/main/ui/static/payment/partner/templates/update_apply_wx_sub_merchant_id.html b/src/main/ui/static/payment/partner/templates/update_apply_wx_sub_merchant_id.html
index 3c86baaed..5502868db 100644
--- a/src/main/ui/static/payment/partner/templates/update_apply_wx_sub_merchant_id.html
+++ b/src/main/ui/static/payment/partner/templates/update_apply_wx_sub_merchant_id.html
@@ -94,7 +94,7 @@
                                 <label class="control-label col-sm-3" for="website_input">* Website</label>
                                 <div class="col-sm-8">
                                     <input class="form-control" ng-model="subMerchantInfo.company_website"
-                                           type="url" name="website" id="website_input" required maxlength="128">
+                                           type="url" name="website" id="website_input" required maxlength="100">
                                     <p class="small " >(Not required when  business type is Offline scenario)</p>
                                     <div ng-messages="subForm.company_website.$error" ng-if="subForm.company_website.$dirty">
                                         <p class="small text-danger" ng-message="required">Required Field</p>
@@ -162,10 +162,10 @@
                                 <label class="control-label col-sm-3" for="contact_email_input">* Contact Email</label>
                                 <div class="col-sm-8">
                                     <input class="form-control" ng-model="subMerchantInfo.contact_email"
-                                           type="text" name="contact_email" id="contact_email_input" required maxlength="128">
+                                           type="text" name="contact_email" id="contact_email_input" required maxlength="50">
                                     <div ng-messages="subForm.contact_email.$error" ng-if="subForm.contact_email.$dirty">
                                         <p class="small text-danger" ng-message="required">Required Field</p>
-                                        <p class="small text-danger" ng-message="maxlength">Length is more than 128</p>
+                                        <p class="small text-danger" ng-message="maxlength">Length is more than 50</p>
                                     </div>
                                 </div>
                             </div>

From 46783b0a6d006d267c44f86495a104c536ebd677 Mon Sep 17 00:00:00 2001
From: AlanFenng <ycfxx521@163.com>
Date: Wed, 27 Jan 2021 15:04:56 +0800
Subject: [PATCH 2/2] release 2.3.77

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 2d7a0d240..6d785065f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>manage</artifactId>
-    <version>2.3.77-SNAPSHOT</version>
+    <version>2.3.77</version>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <jib-maven-plugin.version>2.4.0</jib-maven-plugin.version>