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 |    8 +++++++-
 1 files changed, 7 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 0053dce..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
@@ -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;
@@ -99,6 +102,9 @@
     @ApiModelProperty(value = "0 鍚敤 1 绂佺敤")
     private Integer status;
 
+    @ApiModelProperty(value = "寰俊灏忕▼搴廜PENID")
+    private String openid;
+
     @ApiModelProperty(value = "鎵�灞炰紒涓氫俊鎭")
     @TableField(exist = false)
     private Company company;

--
Gitblit v1.9.3