From c8df02a7b07086e17bacda6cdc015d76ac1f82fe Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期三, 04 九月 2024 17:16:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ycl-pojo/src/main/java/com/ycl/platform/domain/vo/YwPointVO.java | 20 ++++++++++++--------
1 files changed, 12 insertions(+), 8 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 069ed5b..42ae6e1 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
@@ -4,16 +4,12 @@
import com.ycl.platform.base.AbsVo;
import com.ycl.platform.domain.entity.YwPoint;
-import java.time.LocalDateTime;
import java.util.Date;
import java.util.List;
-import enumeration.general.ImportantTagEnum;
-import enumeration.general.ProvinceTagEnum;
import org.springframework.lang.NonNull;
import org.springframework.beans.BeanUtils;
import lombok.Data;
-import lombok.experimental.Accessors;
/**
* 杩愮淮鐐逛綅灞曠ず
@@ -45,17 +41,25 @@
/** 澶囨敞 */
private String remark;
- private Short category;
-
/** 鐩戠閮ㄩ棬 */
private Long deptId;
private List<Long> deptIds;
private String deptName;
/** 閲嶇偣鐐逛綅鏍囩 */
- private ImportantTagEnum importantTag;
+ private Boolean importantTag;
+
/** 鐪佸巺鐐逛綅鏍囩 */
- private ProvinceTagEnum provinceTag;
+ private Boolean provinceTag;
+
+ /** 閲嶇偣鎸囨尌鍥惧儚鏍囩 */
+ private Boolean importantCommandImageTag;
+
+ /** 閮ㄧ骇鏍囩 */
+ private Boolean deptTag;
+
+ /** 鍥芥爣鐮� */
+ private String serialNumber;
public static YwPointVO getVoByEntity(@NonNull YwPoint entity, YwPointVO vo) {
if(vo == null) {
--
Gitblit v1.8.0