From c9f07c1f79e7ea9eb00925975d3ae2c9e8dcbd25 Mon Sep 17 00:00:00 2001
From: nidapeng <jp@doumee.com>
Date: 星期三, 20 三月 2024 11:37:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/1.0.1' into 1.0.1
---
server/service/src/main/java/com/doumee/dao/system/model/SystemUser.java | 6 +++---
1 files changed, 3 insertions(+), 3 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 76f617f..74ae18e 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
@@ -73,9 +73,6 @@
@ApiModelProperty(value = "瀵嗙爜")
@NotBlank(message = "鍒濆瀵嗙爜涓嶈兘涓虹┖")
private String password;
- @ApiModelProperty(value = "openid")
- @NotBlank(message = "openid")
- private String openid;
@ApiModelProperty(value = "鐩�")
private String salt;
@@ -102,6 +99,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