From 55ba702c1df240929e68df3b42fa9cb0607378b8 Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期一, 08 九月 2025 10:58:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0.1' into 2.0.1
---
server/services/src/main/java/com/doumee/dao/business/model/Member.java | 15 ++++++++++-----
1 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/server/services/src/main/java/com/doumee/dao/business/model/Member.java b/server/services/src/main/java/com/doumee/dao/business/model/Member.java
index d8171dd..9b18956 100644
--- a/server/services/src/main/java/com/doumee/dao/business/model/Member.java
+++ b/server/services/src/main/java/com/doumee/dao/business/model/Member.java
@@ -1,5 +1,6 @@
package com.doumee.dao.business.model;
+import com.baomidou.mybatisplus.annotation.TableLogic;
import com.doumee.core.annotation.excel.ExcelColumn;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -18,7 +19,7 @@
*/
@Data
@ApiModel("鐢ㄦ埛淇℃伅琛�")
-@TableName("`member`")
+@TableName("\"member\"")
public class Member {
@ApiModelProperty(value = "缂栫爜")
@@ -27,7 +28,7 @@
@ApiModelProperty(value = "鍒涘缓鏃堕棿")
@ExcelColumn(name="鍒涘缓鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
+ //@JsonFormat(pattern = "yyyy-MM-dd")
private Date createDate;
@ApiModelProperty(value = "鍒涘缓浜�")
@@ -36,7 +37,7 @@
@ApiModelProperty(value = "缂栬緫鏃堕棿")
@ExcelColumn(name="缂栬緫鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
+ //@JsonFormat(pattern = "yyyy-MM-dd")
private Date editDate;
@ApiModelProperty(value = "缂栬緫浜�")
@@ -45,6 +46,7 @@
@ApiModelProperty(value = "鏄惁宸插垹闄� 0鏈垹闄� 1宸插垹闄�", example = "1")
@ExcelColumn(name="鏄惁宸插垹闄� 0鏈垹闄� 1宸插垹闄�")
+
private Integer isdeleted;
@ApiModelProperty(value = "澶囨敞")
@@ -81,12 +83,12 @@
@ApiModelProperty(value = "娉ㄥ唽鏃堕棿")
@ExcelColumn(name="娉ㄥ唽鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
+ //@JsonFormat(pattern = "yyyy-MM-dd")
private Date registerDate;
@ApiModelProperty(value = "鏈�杩戠杞︽椂闂�")
@ExcelColumn(name="鏈�杩戠杞︽椂闂�")
- @JsonFormat(pattern = "yyyy-MM-dd")
+ //@JsonFormat(pattern = "yyyy-MM-dd")
private Date lastRendId;
@ApiModelProperty(value = "鎵嬫満鍙�")
@@ -116,5 +118,8 @@
@ApiModelProperty(value = "澶村儚")
@ExcelColumn(name="澶村儚")
private String imgurl;
+ @ApiModelProperty(value = "鍏宠仈绯荤粺绠＄悊鍛樿处鍙风紪鐮�")
+ @ExcelColumn(name="鍏宠仈绯荤粺绠＄悊鍛樿处鍙风紪鐮�")
+ private String sysuserId;
}
--
Gitblit v1.9.3