From cdc151b7ee5742f5d6db56df781f6ce0b4c7e177 Mon Sep 17 00:00:00 2001
From: luoyang <yang.luo@globalfreepay.com>
Date: Tue, 11 Feb 2020 10:18:22 +0800
Subject: [PATCH] =?UTF-8?q?add=20=E5=AD=90=E5=95=86=E6=88=B7=E5=88=86?=
 =?UTF-8?q?=E9=A1=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                                                         | 2 +-
 .../payment/manage/merchants/web/PartnerManageController.java   | 2 +-
 src/main/ui/static/payment/partner/templates/sub_partners.html  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index f8515097f..902d63450 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>manage</artifactId>
-    <version>1.3.28</version>
+    <version>1.3.29</version>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <jib-maven-plugin.version>1.4.0</jib-maven-plugin.version>
diff --git a/src/main/java/au/com/royalpay/payment/manage/merchants/web/PartnerManageController.java b/src/main/java/au/com/royalpay/payment/manage/merchants/web/PartnerManageController.java
index be10148f3..dbec29599 100644
--- a/src/main/java/au/com/royalpay/payment/manage/merchants/web/PartnerManageController.java
+++ b/src/main/java/au/com/royalpay/payment/manage/merchants/web/PartnerManageController.java
@@ -501,7 +501,7 @@ public class PartnerManageController {
     }
 
     @ManagerMapping(value = "/{clientMoniker}/sub_clients/{page}", method = RequestMethod.GET)
-    public JSONObject listSubClients(@PathVariable String clientMoniker,@PathVariable int page, @ModelAttribute(CommonConsts.MANAGER_STATUS) JSONObject manager) {
+    public JSONObject listSubClientsByPage(@PathVariable String clientMoniker,@PathVariable int page, @ModelAttribute(CommonConsts.MANAGER_STATUS) JSONObject manager) {
         return clientManager.listSubClientsByPage(manager, clientMoniker,page);
     }
 
diff --git a/src/main/ui/static/payment/partner/templates/sub_partners.html b/src/main/ui/static/payment/partner/templates/sub_partners.html
index 35a52563d..bc84644e8 100644
--- a/src/main/ui/static/payment/partner/templates/sub_partners.html
+++ b/src/main/ui/static/payment/partner/templates/sub_partners.html
@@ -148,7 +148,7 @@
                             last-text="&raquo;"></uib-pagination>
             <div class="row">
                 <div class="col-xs-12">
-                    {{'select.sign.total_records'|translate}}:{{pagination.totalCount}};{{'partners.total_pages'|translate}}:{{pagination.totalPages}}
+                    Total Records:{{pagination.totalCount}};Total Pages:{{pagination.totalPages}}
                 </div>
             </div>
         </div>