add rsvc增加abn\acn字段

pom.xml

@@ -9,7 +9,7 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>manage</artifactId>
-    <version>1.3.81</version>
+    <version>1.3.82</version>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <jib-maven-plugin.version>1.8.0</jib-maven-plugin.version>

src/main/java/au/com/royalpay/payment/manage/appclient/beans/RSvcMchBean.java

@@ -96,4 +96,6 @@ public class RSvcMchBean {
      * abn
      */
     private String abn;
+
+    private String acn;
 }

src/main/java/au/com/royalpay/payment/manage/merchants/core/impls/ClientManagerImpl.java

@@ -6614,8 +6614,9 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid
         svcMchBean.setBsbNumber(mchInfo.getString("bsb_no"));
         svcMchBean.setAccountNo(mchInfo.getString("account_no"));
         svcMchBean.setAccountName(mchInfo.getString("account_name"));
-        svcMchBean.setTelNumber(mchInfo.getString("bank_phone"));
+        svcMchBean.setTelNumber("");
         svcMchBean.setAbn(mchInfo.getString("abn"));
+        svcMchBean.setAcn(mchInfo.getString("acn"));
         return svcMchBean;
     }
 

src/main/resources/au/com/royalpay/payment/manage/mappers/system/ClientAccountMapper.xml

@@ -55,12 +55,12 @@
             sc.contact_person,
             sc.contact_phone,
             sc.contact_email,
-            IFNULL( sc.abn, sc.acn ) abn,
+            IFNULL(sc.abn,'') abn,
+            IFNULL(sc.acn,'') acn,
             sba.bsb_no,
             sba.account_name,
             sba.account_no,
-            IFNULL( sba.address, 'NONE' ) bank_address,
+            IFNULL( sba.address, '' ) bank_address
-            'NONE' bank_phone
         FROM
             sys_accounts sa,
             sys_clients sc,