From a3ac76efa8bb383dd8e2151760762aa14d048892 Mon Sep 17 00:00:00 2001
From: nidapeng <jp@doumee.com>
Date: 星期四, 14 三月 2024 09:49:36 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/service/src/main/java/com/doumee/dao/system/model/SystemUser.java | 7 ++++++-
1 files changed, 6 insertions(+), 1 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 d66ac4d..76f617f 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
@@ -67,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;
@@ -98,9 +101,11 @@
@ApiModelProperty(value = "0 鍚敤 1 绂佺敤")
private Integer status;
+
@ApiModelProperty(value = "鎵�灞炰紒涓氫俊鎭")
@TableField(exist = false)
private Company company;
+
@ApiModelProperty(value = "鏉冮檺鍐呬紒涓氱紪鐮侀泦鍚�")
@TableField(exist = false)
private List<Integer> companyIdList;
--
Gitblit v1.9.3