From 277f2d65a70bddbf9c571e2023315faad26e12d0 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期一, 18 三月 2024 14:11:44 +0800
Subject: [PATCH] Merge branch 'master' into 1.0.1
---
server/service/src/main/java/com/doumee/dao/system/model/SystemUser.java | 16 ++++++++++++++--
1 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/server/service/src/main/java/com/doumee/dao/system/model/SystemUser.java b/server/service/src/main/java/com/doumee/dao/system/model/SystemUser.java
index 2679ba9..9f39744 100644
--- a/server/service/src/main/java/com/doumee/dao/system/model/SystemUser.java
+++ b/server/service/src/main/java/com/doumee/dao/system/model/SystemUser.java
@@ -17,6 +17,7 @@
import javax.validation.constraints.Pattern;
import java.io.Serializable;
import java.util.Date;
+import java.util.List;
/**
* 绯荤粺鐢ㄦ埛
@@ -66,12 +67,15 @@
@ApiModelProperty(value = "浼佷笟缂栫爜")
private Integer companyId;
- @ApiModelProperty(value = "绫诲瀷 0骞冲彴鐢ㄦ埛 1浼佷笟鐢ㄦ埛")
+ @ApiModelProperty(value = "绫诲瀷 0骞冲彴鐢ㄦ埛 1浼佷笟鐢ㄦ埛 2鍟嗘埛鐢ㄦ埛")
private Integer type;
@ApiModelProperty(value = "瀵嗙爜")
@NotBlank(message = "鍒濆瀵嗙爜涓嶈兘涓虹┖")
private String password;
+ @ApiModelProperty(value = "openid")
+ @NotBlank(message = "openid")
+ private String openid;
@ApiModelProperty(value = "鐩�")
private String salt;
@@ -97,8 +101,16 @@
@ApiModelProperty(value = "0 鍚敤 1 绂佺敤")
private Integer status;
- @ApiModelProperty(value = "0 鍚敤 1 绂佺敤")
+
+ @ApiModelProperty(value = "寰俊灏忕▼搴廜PENID")
+ private String openid;
+
+ @ApiModelProperty(value = "鎵�灞炰紒涓氫俊鎭")
@TableField(exist = false)
private Company company;
+ @ApiModelProperty(value = "鏉冮檺鍐呬紒涓氱紪鐮侀泦鍚�")
+ @TableField(exist = false)
+ private List<Integer> companyIdList;
+
}
--
Gitblit v1.9.3