From 5ae8418d22dd7ba374ff7277181aceec1d509324 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 16 七月 2025 18:26:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/services/src/main/java/com/doumee/dao/business/model/IdentityInfo.java | 19 +++++++++++++++----
1 files changed, 15 insertions(+), 4 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 2974faf..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
@@ -11,6 +11,7 @@
import com.fasterxml.jackson.annotation.JsonFormat;
import java.util.Date;
import java.math.BigDecimal;
+import java.util.List;
/**
* 浼氬憳韬唤璁よ瘉淇℃伅琛�
@@ -22,13 +23,14 @@
@TableName("`identity_info`")
public class IdentityInfo {
+ @TableId(type = IdType.AUTO)
@ApiModelProperty(value = "涓婚敭", example = "1")
@ExcelColumn(name="涓婚敭")
private Integer id;
@ApiModelProperty(value = "鏄惁宸插垹闄� 0鏈垹闄� 1宸插垹闄�", example = "1")
@ExcelColumn(name="鏄惁宸插垹闄� 0鏈垹闄� 1宸插垹闄�")
- private Byte deleted;
+ private Integer deleted;
@ApiModelProperty(value = "鍒涘缓浜虹紪鐮�", example = "1")
@ExcelColumn(name="鍒涘缓浜虹紪鐮�")
@@ -36,7 +38,6 @@
@ApiModelProperty(value = "鍒涘缓鏃堕棿")
@ExcelColumn(name="鍒涘缓鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
private Date createTime;
@ApiModelProperty(value = "鏇存柊浜虹紪鐮�", example = "1")
@@ -45,7 +46,6 @@
@ApiModelProperty(value = "鏇存柊鏃堕棿")
@ExcelColumn(name="鏇存柊鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
private Date updateTime;
@ApiModelProperty(value = "澶囨敞")
@@ -110,7 +110,6 @@
@ApiModelProperty(value = "璁よ瘉瀹℃壒鏃堕棿")
@ExcelColumn(name="璁よ瘉瀹℃壒鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
private Date auditTime;
@ApiModelProperty(value = "璁よ瘉瀹℃壒澶囨敞")
@@ -120,4 +119,16 @@
@ApiModelProperty(value = "鍥剧墖鍓嶇紑")
@TableField(exist = false)
private String prefix;
+ @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