From fd765fb823fb60fc942b09e17a5d13ad4aef2f96 Mon Sep 17 00:00:00 2001
From: sen <sen@qq.com>
Date: 星期三, 08 四月 2026 15:11:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/cwxt_master' into cwxt_master
---
service/src/main/java/com/ruoyi/cwgl/domain/dto/ReceivableAuditLog.java | 59 ++++++++++++-----------------------------------------------
1 files changed, 12 insertions(+), 47 deletions(-)
diff --git a/service/src/main/java/com/ruoyi/cwgl/domain/dto/ReceivableAuditLog.java b/service/src/main/java/com/ruoyi/cwgl/domain/dto/ReceivableAuditLog.java
index 309a64a..e004d4f 100644
--- a/service/src/main/java/com/ruoyi/cwgl/domain/dto/ReceivableAuditLog.java
+++ b/service/src/main/java/com/ruoyi/cwgl/domain/dto/ReceivableAuditLog.java
@@ -1,5 +1,8 @@
package com.ruoyi.cwgl.domain.dto;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.common.annotation.Excel;
import lombok.Data;
import java.util.Date;
@@ -9,58 +12,20 @@
@Data
public class ReceivableAuditLog {
- /**
- * 璐﹀崟ID
- */
- private Integer billId;
+ /** 搴旀敹璐﹀崟id */
- /**
- * 璐﹀崟缂栧彿
- */
- private String billNo;
+ private Integer headId;
- /**
- * 璐﹀崟鍚嶇О
- */
- private String billName;
- /**
- * 瀹㈡埛鍚嶇О
- */
- private String customerName;
+ /** 鍒涘缓鑰� */
+ private String createBy;
- /**
- * 鏉ユ簮绯荤粺
- */
- private String sourceSystem;
- /**
- * 瀹℃牳鍓嶇姸鎬�
- */
- private Integer beforeAuditStatus;
+ /** 鍒涘缓鏃堕棿 */
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ private Date createTime;
- /**
- * 瀹℃牳缁撴灉
- */
- private Integer auditResult;
- /**
- * 瀹℃牳鎰忚
- */
- private String auditComment;
-
- /**
- * 瀹℃牳浜�
- */
- private String auditUser;
-
- /**
- * 瀹℃牳鏃堕棿
- */
- private Date auditTime;
-
- /**
- * 鎬婚噾棰�
- */
- private java.math.BigDecimal totalAmount;
+ /** 鎿嶄綔璇存槑 */
+ private String operation;
}
\ No newline at end of file
--
Gitblit v1.8.0