From 8439887c903fa52560af52b40e12a1baa8a123d3 Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期三, 05 七月 2023 10:27:43 +0800
Subject: [PATCH] 代码合并
---
ycl-platform/src/main/java/com/ycl/entity/message/SmsAudit.java | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 52 insertions(+), 2 deletions(-)
diff --git a/ycl-platform/src/main/java/com/ycl/entity/message/SmsAudit.java b/ycl-platform/src/main/java/com/ycl/entity/message/SmsAudit.java
index 456f047..1647888 100644
--- a/ycl-platform/src/main/java/com/ycl/entity/message/SmsAudit.java
+++ b/ycl-platform/src/main/java/com/ycl/entity/message/SmsAudit.java
@@ -47,6 +47,12 @@
@ApiModelProperty(value = "瀹℃牳浜篒d")
private Long auditId;
/**
+ * 鐪熷疄瀹℃牳Id
+ */
+ @TableField("real_audit_id")
+ @ApiModelProperty(value = "瀹℃牳浜篒d")
+ private Long realAuditId;
+ /**
* 瀹℃牳鐘舵��
*/
@TableField("audit_status")
@@ -57,13 +63,13 @@
*/
@TableField("audit_result")
@ApiModelProperty(value = "瀹℃牳缁撴灉")
- private Integer auditResult;
+ private String auditResult;
/**
* 瀹℃牳鎰忚
*/
@TableField("audit_opinion")
@ApiModelProperty(value = "瀹℃牳鎰忚")
- private Integer auditOpinion;
+ private String auditOpinion;
/**
* 鍒涘缓浜�
*/
@@ -88,4 +94,48 @@
@TableField("update_time")
@ApiModelProperty(value = "鏇存柊鏃堕棿")
private Date updateTime;
+
+ /**
+ * 鏍囬
+ */
+ @ApiModelProperty(value = "鏍囬")
+ @TableField(value = "title",exist = false)
+ private String title;
+ /**
+ * 娑堟伅浣�
+ */
+ @ApiModelProperty(value = "娑堟伅浣�")
+ @TableField(value = "body",exist = false)
+ private String body;
+ /**
+ * 瀹℃牳浜烘枃鏈�
+ */
+ @ApiModelProperty(value = "瀹℃牳浜烘枃鏈�")
+ @TableField(value = "audit_text",exist = false)
+ private String auditText;
+ /**
+ * 鐪熷疄瀹℃牳浜�
+ */
+ @ApiModelProperty(value = "鐪熷疄瀹℃牳浜�")
+ @TableField(value = "real_audit_text",exist = false)
+ private String realAuditText;
+ /**
+ * 鍒涘缓浜烘枃鏈�
+ */
+ @ApiModelProperty(value = "鍒涘缓浜烘枃鏈�")
+ @TableField(value = "create_user_text",exist = false)
+ private String createUserText;
+ /**
+ * 鏇存柊浜烘枃鏈�
+ */
+ @ApiModelProperty(value = "鏇存柊浜烘枃鏈�")
+ @TableField(value = "update_user_text",exist = false)
+ private String updateUserText;
+ /**
+ * 瀹℃牳鐘舵�佹枃鏈�
+ */
+ @ApiModelProperty(value = "瀹℃牳鐘舵�佹枃鏈�")
+ @TableField(value = "audit_status_text",exist = false)
+ private String auditStatusText;
+
}
--
Gitblit v1.8.0