From 22603b2519b8dcb7f9a7c7d9ba636d9aba240a59 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 18 七月 2025 09:15:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/services/src/main/java/com/doumee/dao/business/model/IdentityInfo.java | 10 +++++++---
1 files changed, 7 insertions(+), 3 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 25b70ce..82fda4b 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,7 +110,6 @@
@ApiModelProperty(value = "璁よ瘉瀹℃壒鏃堕棿")
@ExcelColumn(name="璁よ瘉瀹℃壒鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
private Date auditTime;
@ApiModelProperty(value = "璁よ瘉瀹℃壒澶囨敞")
@@ -124,6 +122,12 @@
@ApiModelProperty(value = "瀹℃牳浜哄鍚�")
@TableField(exist = false)
private String editorName;
+ @ApiModelProperty(value = "鐢ㄦ埛openid")
+ @TableField(exist = false)
+ private String openid;
+ @ApiModelProperty(value = "鐢ㄦ埛鏄电О")
+ @TableField(exist = false)
+ private String memberName;
@ApiModelProperty(value = "鍥剧墖闆嗗悎")
@TableField(exist = false)
private List<String> imgList;
--
Gitblit v1.9.3