From 4658e9353f7aa76a833d36ed988d77bf362ad0ea Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期二, 21 五月 2024 11:54:12 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmvisit
---
server/system_service/src/main/java/com/doumee/dao/system/model/SystemUser.java | 10 +++++++++-
1 files changed, 9 insertions(+), 1 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..7b8d088 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;
@@ -25,12 +26,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 = "鐢ㄦ埛鍚嶄笉鑳戒负绌�")
@@ -99,5 +102,10 @@
@ApiModelProperty(value = "0 鍚敤 1 绂佺敤")
private Integer status;
+ @ApiModelProperty(value = "浼佷笟缂栫爜锛堝叧鑱攃ompany锛�")
+ private Integer companyId;
+ @ApiModelProperty(value = "0 鍚敤 1 绂佺敤")
+ @TableField(exist = false)
+ private String companyName;
}
--
Gitblit v1.9.3