Merge branch 'develop'

src/main/ui/manage.html

@@ -605,7 +605,7 @@ margin-bottom: 10%;"/>
                         </li>
                         <li ui-sref-active="active" ng-if="('preRefund'|withModule)">
                             <a ui-sref="analysis_monitoring.pre_refund" ui-sref-opts="{reload:true}">
-                                <i class="fa fa-tv"></i> <span>商户欠款|Pre Refund</span>
+                                <i class="fa fa-tv"></i> <span>授信退款|Credit refund/span>
                             </a>
                         </li>
                         <li ui-sref-active="active">

src/main/ui/static/analysis/templates/pre_refund.html

@@ -1,10 +1,10 @@
 <section class="content-header">
-    <h1>商户欠款|Pre Refund</h1>
+    <h1>授信退款|Credit refund</h1>
     <ol class="breadcrumb">
         <li>
             <i class="fa fa-list-alt"></i> Transaction
         </li>
-        <li class="active">商户欠款|Pre Refund</li>
+        <li class="active">授信退款|Credit refund</li>
     </ol>
 </section>
 <section class="content">

src/main/ui/static/menu/templates/main_menu.html

@@ -826,7 +826,7 @@
                         <div class="description-block">
                             <img src="/static/images/main_menu/transaction_arrears_green.png"/>
                             <div class="description-text">
-                                <span class="description-text">商户欠款</span>
+                                <span class="description-text">授信退款</span>
                             </div>
                         </div>
                     </a>