From a4047b6048ebfe09e66a765b58ea12b5bd0e2e6e Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期一, 28 十一月 2022 16:18:10 +0800
Subject: [PATCH] 店铺管理优化
---
ycl-common/src/main/java/com/ycl/entity/user/UmsAdmin.java | 35 ++++++++++++++++++++++++++---------
1 files changed, 26 insertions(+), 9 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 6847959..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
@@ -4,13 +4,14 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
+import com.ycl.entity.depart.UmsDepart;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
+import lombok.*;
import java.io.Serializable;
import java.util.Date;
+import java.util.List;
/**
* <p>
@@ -24,6 +25,9 @@
@EqualsAndHashCode(callSuper = false)
@TableName("ums_admin")
@ApiModel(value = "UmsAdmin瀵硅薄", description = "鍚庡彴鐢ㄦ埛琛�")
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
public class UmsAdmin implements Serializable {
private static final long serialVersionUID = 1L;
@@ -42,7 +46,7 @@
@ApiModelProperty(value = "閭")
private String email;
- @ApiModelProperty(value = "鐢ㄦ埛鍚嶏紙绯荤粺榛樿鐢熸垚锛�")
+ @ApiModelProperty(value = "鐪熷疄濮撳悕")
private String nickName;
@ApiModelProperty(value = "澶囨敞淇℃伅")
@@ -64,27 +68,40 @@
private String ipAddress;
@ApiModelProperty(value = "鏄惁鍏氬憳")
- private byte isDy;
+ private Byte isDy;
@ApiModelProperty(value = "鎬у埆")
- private byte sex;
+ private Byte sex;
@ApiModelProperty(value = "鑱屽姟")
private String jobTitle;
-
- @ApiModelProperty(value = "閮ㄩ棬id")
- private Long departmentId;
@ApiModelProperty(value = "閮ㄩ棬鍚嶇О")
@TableField(exist = false)
private String departName;
+
+
@ApiModelProperty(value = "鐢ㄦ埛绫诲瀷")
- private byte userType;
+ private Integer userType;
@ApiModelProperty(value = "搴ф満/鍒嗘満")
private String zj;
@ApiModelProperty(value = "鎵嬫満鍙风爜")
private String mobile;
+
+ @ApiModelProperty(value = "鏄惁涓虹綉鏍肩鐞嗗憳锛�0->涓嶆槸锛�1->鏄�")
+ private Integer isGrid;
+
+ @ApiModelProperty(value = "鍏抽敭瀛楁")
+ @TableField(exist = false)
+ private String keyword;
+ @ApiModelProperty(value = "閮ㄩ棬")
+ @TableField(exist = false)
+ private List<UmsDepart> depart;
+ @ApiModelProperty(value = "瑙掕壊鍒楄〃")
+ @TableField(exist = false)
+ private List<UmsRole> roles;
+
}
--
Gitblit v1.8.0