From 1b0cf0db5c82ea8308d2f338973a91555787c34d Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 18 三月 2025 11:17:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
server/services/src/main/java/com/doumee/dao/business/model/Member.java | 10 ++++++----
1 files changed, 6 insertions(+), 4 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 87049ef..1164937 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;
@@ -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 = "鎵嬫満鍙�")
--
Gitblit v1.9.3