From 4e2e52b766d87fc528d02bdebc1757c3dda8c596 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 26 二月 2025 09:22:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/system_service/src/main/java/com/doumee/dao/business/model/Member.java | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/server/system_service/src/main/java/com/doumee/dao/business/model/Member.java b/server/system_service/src/main/java/com/doumee/dao/business/model/Member.java
index 0234167..329c600 100644
--- a/server/system_service/src/main/java/com/doumee/dao/business/model/Member.java
+++ b/server/system_service/src/main/java/com/doumee/dao/business/model/Member.java
@@ -2,7 +2,7 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.doumee.core.annotation.excel.ExcelColumn;
-import com.doumee.core.model.LoginUserModel;
+import com.doumee.service.business.third.model.LoginUserModel;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import com.baomidou.mybatisplus.annotation.IdType;
@@ -96,6 +96,8 @@
@JsonFormat(pattern = "yyyy-MM-dd")
@ExcelColumn(name="鍏ヨ亴鏃ユ湡",index =9,width = 10, dateFormat = "yyyy-MM-dd")
private Date jobDate;
+ @ApiModelProperty(value = "濮撳悕鎷奸煶棣栧瓧姣�")
+ private String pinyin;
@ApiModelProperty(value = "鍩硅缁撴潫鏃堕棿")
@TableField(exist = false)
@ExcelColumn(name="鍩硅缁撴潫鏃堕棿",index =10,width = 10, dateFormat = "yyyy-MM-dd")
--
Gitblit v1.9.3