From 391c0cfc4ba595ef26c7a2315c555d8c75afec7d Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期五, 22 八月 2025 11:13:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/services/src/main/java/com/doumee/dao/business/model/IdentityInfo.java | 8 ++------
1 files changed, 2 insertions(+), 6 deletions(-)
diff --git a/server/services/src/main/java/com/doumee/dao/business/model/IdentityInfo.java b/server/services/src/main/java/com/doumee/dao/business/model/IdentityInfo.java
index 7ea95d9..9e29c9d 100644
--- a/server/services/src/main/java/com/doumee/dao/business/model/IdentityInfo.java
+++ b/server/services/src/main/java/com/doumee/dao/business/model/IdentityInfo.java
@@ -23,6 +23,7 @@
@TableName("`identity_info`")
public class IdentityInfo {
+ @TableId(type = IdType.AUTO)
@ApiModelProperty(value = "涓婚敭", example = "1")
@ExcelColumn(name="涓婚敭")
private Integer id;
@@ -37,7 +38,6 @@
@ApiModelProperty(value = "鍒涘缓鏃堕棿")
@ExcelColumn(name="鍒涘缓鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
private Date createTime;
@ApiModelProperty(value = "鏇存柊浜虹紪鐮�", example = "1")
@@ -46,7 +46,6 @@
@ApiModelProperty(value = "鏇存柊鏃堕棿")
@ExcelColumn(name="鏇存柊鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
private Date updateTime;
@ApiModelProperty(value = "澶囨敞")
@@ -111,16 +110,13 @@
@ApiModelProperty(value = "璁よ瘉瀹℃壒鏃堕棿")
@ExcelColumn(name="璁よ瘉瀹℃壒鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
private Date auditTime;
@ApiModelProperty(value = "璁よ瘉瀹℃壒澶囨敞")
@ExcelColumn(name="璁よ瘉瀹℃壒澶囨敞")
private String auditRemark;
- @ApiModelProperty(value = "鍥剧墖鍓嶇紑")
- @TableField(exist = false)
- private String prefix;
+
@ApiModelProperty(value = "瀹℃牳浜哄鍚�")
@TableField(exist = false)
private String editorName;
--
Gitblit v1.9.3