From 01ce838f9f1f7f2c5f34e16ff70d3a11d25ca3c5 Mon Sep 17 00:00:00 2001
From: liuxinxin <xinxin.liu@geekforbest.com>
Date: Fri, 6 Dec 2019 16:00:39 +0800
Subject: [PATCH] [R] Merchant Id Applicaitons fix

---
 .../payment/partner/templates/sub_merchant_id_apply.html      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/ui/static/payment/partner/templates/sub_merchant_id_apply.html b/src/main/ui/static/payment/partner/templates/sub_merchant_id_apply.html
index 11b10aacc..08c50f821 100644
--- a/src/main/ui/static/payment/partner/templates/sub_merchant_id_apply.html
+++ b/src/main/ui/static/payment/partner/templates/sub_merchant_id_apply.html
@@ -30,8 +30,8 @@
             <div class="box-solid">
                 <div class="box box-warning">
                     <div class="box-header">
-                        <h3 class="box-title pull-left" ng-if="partner.sub_merchant_id">
-                            Wechat Sub Merchant Id : {{partner.sub_merchant_id}}
+                        <h3 class="box-title pull-left" >
+                            Wechat Sub Merchant Id : <span ng-bind="partner.sub_merchant_id"></span> <span ng-if="!partner.sub_merchant_id">none</span>
                             <i class="fa fa-clock-o text-danger" title="Using temp Sub Merchant ID" ng-if="partner.temp_sub_merchant"></i>
                         </h3>
                         <button role="button" class="btn btn-info pull-right" title="Apply Sub Merchant Id"