From 6c56f35bef519265b4e7ae98fda6ca87855daf9f Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期四, 15 十二月 2022 11:29:08 +0800
Subject: [PATCH] Merge branch 'master' of http://42.193.1.25:9521/r/sccg_server
---
ycl-common/src/main/java/com/ycl/entity/user/UmsAdmin.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/ycl-common/src/main/java/com/ycl/entity/user/UmsAdmin.java b/ycl-common/src/main/java/com/ycl/entity/user/UmsAdmin.java
index dee13d0..dff07d7 100644
--- a/ycl-common/src/main/java/com/ycl/entity/user/UmsAdmin.java
+++ b/ycl-common/src/main/java/com/ycl/entity/user/UmsAdmin.java
@@ -83,7 +83,7 @@
@ApiModelProperty(value = "鐢ㄦ埛绫诲瀷")
- private Byte userType;
+ private Integer userType;
@ApiModelProperty(value = "搴ф満/鍒嗘満")
private String zj;
@@ -99,7 +99,7 @@
private String keyword;
@ApiModelProperty(value = "閮ㄩ棬")
@TableField(exist = false)
- private UmsDepart depart;
+ private List<UmsDepart> depart;
@ApiModelProperty(value = "瑙掕壊鍒楄〃")
@TableField(exist = false)
private List<UmsRole> roles;
--
Gitblit v1.8.0