From 74c08a504d55ae137004cb44e0145010f62f9585 Mon Sep 17 00:00:00 2001
From: Administrator <1144154118@qq.com>
Date: 星期五, 25 八月 2023 14:47:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ard-work/src/main/java/com/ruoyi/dispatch/domain/ArdDispatchPolice.java | 23 ++++++++++++++++++-----
1 files changed, 18 insertions(+), 5 deletions(-)
diff --git a/ard-work/src/main/java/com/ruoyi/dispatch/domain/ArdDispatchPolice.java b/ard-work/src/main/java/com/ruoyi/dispatch/domain/ArdDispatchPolice.java
index 64d3dab..b338450 100644
--- a/ard-work/src/main/java/com/ruoyi/dispatch/domain/ArdDispatchPolice.java
+++ b/ard-work/src/main/java/com/ruoyi/dispatch/domain/ArdDispatchPolice.java
@@ -2,6 +2,7 @@
import java.util.List;
+import com.ruoyi.common.core.domain.entity.SysUser;
import lombok.Data;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
@@ -25,6 +26,10 @@
@Excel(name = "娲捐鍚嶇О")
private String name;
+ /** 鎻忚堪 */
+ @Excel(name = "鎻忚堪")
+ private String text;
+
/** 缁忓害 */
@Excel(name = "缁忓害")
private Double longitude;
@@ -42,7 +47,7 @@
private String userId;
/** 娲捐鍏宠仈鐢ㄦ埛淇℃伅 */
- private List<String> ardDispatchPoliceUserList;
+ private List<SysUser> sysUserList;
public void setId(String id)
{
@@ -99,11 +104,19 @@
return userId;
}
- public List<String> getArdDispatchPoliceUserList() {
- return ardDispatchPoliceUserList;
+ public List<SysUser> getSysUserList() {
+ return sysUserList;
}
- public void setArdDispatchPoliceUserList(List<String> ardDispatchPoliceUserList) {
- this.ardDispatchPoliceUserList = ardDispatchPoliceUserList;
+ public void setSysUserList(List<SysUser> sysUserList) {
+ this.sysUserList = sysUserList;
+ }
+
+ public String getText() {
+ return text;
+ }
+
+ public void setText(String text) {
+ this.text = text;
}
}
--
Gitblit v1.9.3