From b853f84ea12a830873ca9e1e0da78405d2d5b46c Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期五, 02 八月 2024 15:34:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ycl-pojo/src/main/java/com/ycl/platform/domain/vo/YwPointVO.java | 16 +++++++++++++---
1 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/YwPointVO.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/YwPointVO.java
index 9b41fcf..a67e7dc 100644
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/YwPointVO.java
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/YwPointVO.java
@@ -7,8 +7,6 @@
import java.util.List;
import org.springframework.lang.NonNull;
import org.springframework.beans.BeanUtils;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.experimental.Accessors;
@@ -32,7 +30,8 @@
private LocalDateTime endTime;
/** 杩愮淮鍗曚綅 */
- private Integer unitId;
+ private Long unitId;
+ private String unitName;
/** 杩愮淮鐘舵�� */
private String status;
@@ -40,6 +39,17 @@
/** 澶囨敞 */
private String remark;
+ private Short category;
+
+ /** 鐩戠閮ㄩ棬 */
+ private Long deptId;
+ private List<Long> deptIds;
+ private String deptName;
+
+ /** 鐐逛綅鏍囩 */
+ private String [] pointTags;
+ private String pointTagString;
+
public static YwPointVO getVoByEntity(@NonNull YwPoint entity, YwPointVO vo) {
if(vo == null) {
vo = new YwPointVO();
--
Gitblit v1.8.0