Merge remote-tracking branch 'origin/test' into test

src/main/java/com/ydtech/modules/admin/controller/SysAmountAuditingController.java

@@ -114,7 +114,7 @@ public class SysAmountAuditingController extends BaseController {
                         entity.getBankCardNum(), entity.getBankName(), entity.getBankNum(), entity.getMobile(),
                         entity.getAmount(), entity.getSurplusAmount(), entity.getRealUserName(),
                         entity.getBankAccount(), entity.getBankAddress(), entity.getBankNumber(),
-                        entity.getVoucherId(), entity.getCreateTime());
+                        entity.getVoucherId(), entity.getCreateTime(),entity.getAuditingTime());
                 newList.add(vo);
             }
         }

src/main/java/com/ydtech/modules/admin/model/dto/SysAmountAuditingEntityDto.java

@@ -127,10 +127,18 @@ public class SysAmountAuditingEntityDto {
     private Date createTime;
 
 
+    /**
+     * 创建时间
+     */
+    @ExcelProperty(value="支付时间",index = 19)
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date auditingTime;
+
+
     public SysAmountAuditingEntityDto() {
     }
 
-    public SysAmountAuditingEntityDto(int numbers, String id, String userId, String userName, String leaderId, String leaderName, String accountName, String bankCardNum, String bankName, String bankNum, String mobile, BigDecimal amount, BigDecimal surplusAmount, String realUserName, String bankAccount, String bankAddress, String bankNumber, String voucherId, Date createTime) {
+    public SysAmountAuditingEntityDto(int numbers, String id, String userId, String userName, String leaderId, String leaderName, String accountName, String bankCardNum, String bankName, String bankNum, String mobile, BigDecimal amount, BigDecimal surplusAmount, String realUserName, String bankAccount, String bankAddress, String bankNumber, String voucherId, Date createTime, Date auditingTime) {
         this.numbers = numbers;
         this.id = id;
         this.userId = userId;
@@ -150,5 +158,6 @@ public class SysAmountAuditingEntityDto {
         this.bankNumber = bankNumber;
         this.voucherId = voucherId;
         this.createTime = createTime;
+        this.auditingTime = auditingTime;
     }
 }