Merge branch 'master-wallet'

ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/dto/WalletCathListDTO.java

@@ -43,4 +43,7 @@ public class WalletCathListDTO {
 
     @ApiModelProperty("单号")
     private String cono;
+
+    @ApiModelProperty(value = "用户账号")
+    private String accountNumber;
 }

ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/vo/WalletCathAdminVo.java

@@ -40,4 +40,7 @@ public class WalletCathAdminVo {
     @ApiModelProperty("单号")
     private String cono;
 
+    @ApiModelProperty(value = "用户账号")
+    private String accountNumber;
+
 }

ace-modules/ace-admin/src/main/resources/mapper/MyWalletCathMapper.xml

@@ -14,7 +14,8 @@
         wc.stauts,
         wc.crt_time AS `crtTime`,
         wc.finish_time AS `finishTime`,
-        wc.cono
+        wc.cono,
+        wc.account_number AS `accountNumber`
         FROM
         (SELECT * FROM `my_wallet_cath` <if test="state != null">
         WHERE `stauts`=#{state}