From 0d2a03ec404b9c047d5d5cd4654a48882135be5f Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期四, 26 六月 2025 16:53:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/system_service/src/main/java/com/doumee/dao/business/model/Member.java | 7 ++-----
1 files changed, 2 insertions(+), 5 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 5e2cd10..9c60826 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
@@ -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")
@@ -251,7 +253,6 @@
@ApiModelProperty(value = "鏈夋晥鏈熺被鍨� 0闀挎湡鏈夋晥 1鑷畾涔�",hidden = true )
@TableField(exist = false)
private Integer timeType;
- //鏆傛棤浣跨敤
@ApiModelProperty(value = "濮撳悕/鎵嬫満鍙�/宸ュ彿")
@TableField(exist = false)
private String keyword;
@@ -279,19 +280,15 @@
@ApiModelProperty(value = "鏄惁涓荤 0鍚� 1鏄�", example = "1")
@TableField(exist = false)
private Integer headStatus;
-
-
@ApiModelProperty(value = "闂ㄧ瑙掕壊鍚嶇О")
@TableField(exist = false)
private String roleName;
@ApiModelProperty(value = "鏈�鍚庢搷浣滃唴瀹�")
@TableField(exist = false)
private String optRemark;
-
@ApiModelProperty(value = "system openid" , hidden = true)
@TableField(exist = false)
private String systemOpenid;
-
@ApiModelProperty(value = "鍩硅寮�濮嬫椂闂�")
@TableField(exist = false)
private Date trainStartTime;
--
Gitblit v1.9.3