From bf8d85d5f83c2036fb4239d764d33e99c1b62bd3 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 31 五月 2024 14:53:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/system_service/src/main/java/com/doumee/dao/system/model/SystemUser.java | 15 +++++++++++++--
1 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/server/system_service/src/main/java/com/doumee/dao/system/model/SystemUser.java b/server/system_service/src/main/java/com/doumee/dao/system/model/SystemUser.java
index 4fa3fff..09c5017 100644
--- a/server/system_service/src/main/java/com/doumee/dao/system/model/SystemUser.java
+++ b/server/system_service/src/main/java/com/doumee/dao/system/model/SystemUser.java
@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.doumee.core.constants.OperaType;
+import com.doumee.core.model.LoginUserModel;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import com.baomidou.mybatisplus.annotation.IdType;
@@ -16,6 +17,7 @@
import javax.validation.constraints.Pattern;
import java.io.Serializable;
import java.util.Date;
+import java.util.List;
/**
* 绯荤粺鐢ㄦ埛
@@ -25,12 +27,14 @@
@Data
@ApiModel("绯荤粺鐢ㄦ埛")
@TableName("`SYSTEM_USER`")
-public class SystemUser implements Serializable {
+public class SystemUser extends LoginUserModel implements Serializable {
@TableId(type = IdType.AUTO)
@ApiModelProperty(value = "涓婚敭", example = "1")
@NotNull(message = "涓婚敭涓嶈兘涓虹┖", groups = {OperaType.Update.class})
private Integer id;
+ @ApiModelProperty(value = "鐢ㄦ埛缂栫爜锛堝叧鑱攎ember)", example = "1")
+ private Integer memberId;
@ApiModelProperty(value = "鐢ㄦ埛鍚�")
@NotBlank(message = "鐢ㄦ埛鍚嶄笉鑳戒负绌�")
@@ -44,7 +48,6 @@
private String empNo;
@ApiModelProperty(value = "鐢熸棩")
- @JsonFormat(pattern = "yyyy-MM-dd")
private Date birthday;
@ApiModelProperty(value = "鎬у埆")
@@ -99,5 +102,13 @@
@ApiModelProperty(value = "0 鍚敤 1 绂佺敤")
private Integer status;
+ @ApiModelProperty(value = "浼佷笟缂栫爜锛堝叧鑱攃ompany锛�")
+ private Integer companyId;
+ @ApiModelProperty(value = "0 鍚敤 1 绂佺敤")
+ @TableField(exist = false)
+ private String companyName;
+ @ApiModelProperty(value = "鏁版嵁鏉冮檺鍐呴儴闂ㄧ紪鐮侀泦鍚�")
+ @TableField(exist = false)
+ private List<Integer> companyIdList;
}
--
Gitblit v1.9.3