From 95b6c442989442750fc2fb85869523678adcd698 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期三, 07 八月 2024 09:35:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ycl-pojo/src/main/java/com/ycl/platform/domain/vo/YwPointVO.java | 21 +++++++++++++++++----
1 files changed, 17 insertions(+), 4 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..92b030c 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
@@ -5,10 +5,11 @@
import java.time.LocalDateTime;
import java.util.List;
+
+import enumeration.general.ImportantTagEnum;
+import enumeration.general.ProvinceTagEnum;
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;
@@ -19,7 +20,6 @@
* @since 2024-03-05
*/
@Data
-@Accessors(chain = true)
public class YwPointVO extends AbsVo {
/** 鐐逛綅鍚嶇О */
@@ -32,7 +32,8 @@
private LocalDateTime endTime;
/** 杩愮淮鍗曚綅 */
- private Integer unitId;
+ private Long unitId;
+ private String unitName;
/** 杩愮淮鐘舵�� */
private String status;
@@ -40,6 +41,18 @@
/** 澶囨敞 */
private String remark;
+ private Short category;
+
+ /** 鐩戠閮ㄩ棬 */
+ private Long deptId;
+ private List<Long> deptIds;
+ private String deptName;
+
+ /** 閲嶇偣鐐逛綅鏍囩 */
+ private ImportantTagEnum importantTag;
+ /** 鐪佸巺鐐逛綅鏍囩 */
+ private ProvinceTagEnum provinceTag;
+
public static YwPointVO getVoByEntity(@NonNull YwPoint entity, YwPointVO vo) {
if(vo == null) {
vo = new YwPointVO();
--
Gitblit v1.8.0