From e013e819f7d544c5c8c59e69ce42c3d10e2215e6 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期二, 31 十二月 2024 15:45:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
manage/src/main/java/com/jilongda/manage/authority/model/SecUser.java | 13 ++++++++-----
1 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/manage/src/main/java/com/jilongda/manage/authority/model/SecUser.java b/manage/src/main/java/com/jilongda/manage/authority/model/SecUser.java
index 2c8b1ea..d39c65b 100644
--- a/manage/src/main/java/com/jilongda/manage/authority/model/SecUser.java
+++ b/manage/src/main/java/com/jilongda/manage/authority/model/SecUser.java
@@ -43,7 +43,7 @@
@ApiModelProperty(value = "密码")
@TableField("password")
-// @Length(min = 6, max = 16, message = "密码可输入6~16个字符")
+ @Length(min = 6, max = 16, message = "密码可输入6~16个字符")
@Excel(name = "密码_中英文1-10个字符", width = 15, orderNum = "2")
private String password;
@@ -103,9 +103,12 @@
@TableField("deptId")
private Long deptId;
- @ApiModelProperty(value = "用户类型 1=总经理，2=销售总监，3=客户经理")
+ @ApiModelProperty(value = "类型1平台管理员2验光师3员工")
@TableField("userType")
private Integer userType;
+ @ApiModelProperty(value = "门店id")
+ @TableField("storeId")
+ private Integer storeId;
@ApiModelProperty(value = "省code")
@TableField("provinceCode")
private String provinceCode;
@@ -115,9 +118,9 @@
@ApiModelProperty(value = "区code")
@TableField("areaCode")
private String areaCode;
- @ApiModelProperty(value = "1平台2销售员")
- @TableField("roleType")
- private Integer roleType;
+ @ApiModelProperty(value = "图片")
+ @TableField("pictures")
+ private String pictures;
public boolean isAdmin()
{
--
Gitblit v1.7.1