From 08b030a4cb662725c4f73e3b8a531de2c593369b Mon Sep 17 00:00:00 2001
From: sen <sen@qq.com>
Date: 星期一, 22 十二月 2025 16:01:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/cwxt_master' into cwxt_master
---
common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java | 34 ++++++++++++++++++++++++++++++++++
1 files changed, 34 insertions(+), 0 deletions(-)
diff --git a/common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java b/common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java
index d169139..77f1dbb 100644
--- a/common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java
+++ b/common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java
@@ -3,6 +3,9 @@
import java.util.Date;
import java.util.List;
import javax.validation.constraints.*;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.ruoyi.common.annotation.Excel;
@@ -23,6 +26,7 @@
/** 鐢ㄦ埛ID */
@Excel(name = "鐢ㄦ埛搴忓彿", type = Type.EXPORT, cellType = ColumnType.NUMERIC, prompt = "鐢ㄦ埛缂栧彿")
+ @TableId(value = "user_id", type = IdType.AUTO)
private Long userId;
/** 閮ㄩ棬ID */
@@ -88,6 +92,12 @@
/** 瑙掕壊ID */
private Long roleId;
+
+ private Integer isDriver;
+
+ private Integer driverId;
+
+ private String driverName;
public SysUser()
{
@@ -297,6 +307,30 @@
this.roleId = roleId;
}
+ public Integer getIsDriver() {
+ return isDriver;
+ }
+
+ public void setIsDriver(Integer isDriver) {
+ this.isDriver = isDriver;
+ }
+
+ public Integer getDriverId() {
+ return driverId;
+ }
+
+ public void setDriverId(Integer driverId) {
+ this.driverId = driverId;
+ }
+
+ public String getDriverName() {
+ return driverName;
+ }
+
+ public void setDriverName(String driverName) {
+ this.driverName = driverName;
+ }
+
@Override
public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
--
Gitblit v1.8.0