From 159a565889964eb954b91785f5300687f1215a50 Mon Sep 17 00:00:00 2001
From: yuan <1551130722@qq.com>
Date: Fri, 27 Apr 2018 18:42:34 +0800
Subject: [PATCH] fix html

---
 .../payment/partner/templates/add_partner.html     |  8 ++++----
 .../payment/partner/templates/partner_detail.html  |  8 ++++----
 .../payment/partner/templates/partner_edit.html    | 14 +++++++-------
 3 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/src/main/ui/static/payment/partner/templates/add_partner.html b/src/main/ui/static/payment/partner/templates/add_partner.html
index 9d859a856..5a93b9183 100644
--- a/src/main/ui/static/payment/partner/templates/add_partner.html
+++ b/src/main/ui/static/payment/partner/templates/add_partner.html
@@ -384,16 +384,16 @@
                             </div>
                             <div class="form-group">
                                 <label class="control-label col-sm-2">
-                                    Merchant Introduction</label>
+                                    Merchant Tag</label>
                                 <div class="col-sm-8">
-                                    <input type="text" class="form-control" ng-model="partner.merchant_introduction">
+                                    <input type="text" class="form-control" ng-model="partner.merchant_tag">
                                 </div>
                             </div>
                             <div class="form-group">
                                 <label class="control-label col-sm-2">
-                                    Merchant Tag</label>
+                                    Merchant Introduction</label>
                                 <div class="col-sm-8">
-                                    <input type="text" class="form-control" ng-model="partner.merchant_tag">
+                                    <textarea  class="form-control" ng-model="partner.merchant_introduction"></textarea>
                                 </div>
                             </div>
                             <div class="form-group">
diff --git a/src/main/ui/static/payment/partner/templates/partner_detail.html b/src/main/ui/static/payment/partner/templates/partner_detail.html
index 03d509c9d..45b3f9f87 100644
--- a/src/main/ui/static/payment/partner/templates/partner_detail.html
+++ b/src/main/ui/static/payment/partner/templates/partner_detail.html
@@ -466,16 +466,16 @@
                                 </div>
                                 <div class="form-group">
                                     <label class="control-label col-sm-2">
-                                        Merchant Introduction</label>
+                                        Merchant Tag</label>
                                     <div class="col-sm-8">
-                                        <p class="form-control-static" ng-bind="partner.merchant_introduction"></p>
+                                        <p class="form-control-static" ng-bind="partner.merchant_tag"></p>
                                     </div>
                                 </div>
                                 <div class="form-group">
                                     <label class="control-label col-sm-2">
-                                        Merchant Tag</label>
+                                        Merchant Introduction</label>
                                     <div class="col-sm-8">
-                                        <p class="form-control-static" ng-bind="partner.merchant_tag"></p>
+                                        <p class="form-control-static" ng-bind="partner.merchant_introduction"></p>
                                     </div>
                                 </div>
                                 <div class="form-group">
diff --git a/src/main/ui/static/payment/partner/templates/partner_edit.html b/src/main/ui/static/payment/partner/templates/partner_edit.html
index caeaf1af6..cb9a74b5c 100644
--- a/src/main/ui/static/payment/partner/templates/partner_edit.html
+++ b/src/main/ui/static/payment/partner/templates/partner_edit.html
@@ -277,19 +277,19 @@
                             </div>
                             <div class="form-group">
                                 <label class="control-label col-sm-2">
-                                    Merchant Introduction</label>
+                                    Merchant Tag</label>
                                 <div class="col-sm-8">
-                                    <input type="text" class="form-control" ng-model="partner.merchant_introduction"
-                                           name="merchant_introduction">
+                                    <input type="text" class="form-control" ng-model="partner.merchant_tag"
+                                           name="merchant_tag"
+                                    >
                                 </div>
                             </div>
                             <div class="form-group">
                                 <label class="control-label col-sm-2">
-                                    Merchant Tag</label>
+                                    Merchant Introduction</label>
                                 <div class="col-sm-8">
-                                    <input type="text" class="form-control" ng-model="partner.merchant_tag"
-                                           name="merchant_tag"
-                                    >
+                                    <textarea  class="form-control" ng-model="partner.merchant_introduction"
+                                               name="merchant_introduction"></textarea>
                                 </div>
                             </div>
                             <div class="form-group">