From d1cc113ac2ce39f6a06ab0a838ccf538766580c2 Mon Sep 17 00:00:00 2001
From: yupeng <roc__yu@163.com>
Date: 星期三, 26 三月 2025 17:52:22 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into xizang-changyun
---
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java | 18 +++++++++++-------
1 files changed, 11 insertions(+), 7 deletions(-)
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java
index 9a6eea2..246a26d 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java
@@ -1,18 +1,18 @@
package com.ruoyi.common.core.domain.entity;
-import java.util.Date;
-import java.util.List;
-import javax.validation.constraints.*;
-
import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.common.core.domain.BaseEntity;
+import com.ruoyi.common.xss.Xss;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
-import com.ruoyi.common.core.domain.BaseEntity;
-import com.ruoyi.common.xss.Xss;
+
+import javax.validation.constraints.Email;
+import javax.validation.constraints.Size;
+import java.util.Date;
+import java.util.List;
/**
* 用户对象 sys_user
@@ -131,6 +131,10 @@
@TableField(exist = false)
private List<String> deptIds;
+ @ApiModelProperty(value = "营业部id")
+ @TableField("business_dept_id")
+ private String businessDeptId;
+
public String getRoleName() {
return roleName;
}
--
Gitblit v1.7.1