From 71972694f7d5f23cf42226366a9ddaad4b72b89f Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期五, 20 九月 2024 09:33:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ycl-pojo/src/main/java/com/ycl/platform/domain/vo/YwPointVO.java | 30 +++++++++++++++++++++---------
1 files changed, 21 insertions(+), 9 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 f3265dd..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
@@ -1,14 +1,15 @@
package com.ycl.platform.domain.vo;
+import com.fasterxml.jackson.annotation.JsonFormat;
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 org.springframework.lang.NonNull;
import org.springframework.beans.BeanUtils;
import lombok.Data;
-import lombok.experimental.Accessors;
/**
* 杩愮淮鐐逛綅灞曠ず
@@ -23,10 +24,12 @@
private String pointName;
/** 鐐逛綅寮�濮嬫椂闂� */
- private LocalDateTime startTime;
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ private Date startTime;
/** 鐐逛綅缁撴潫鏃堕棿 */
- private LocalDateTime endTime;
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ private Date endTime;
/** 杩愮淮鍗曚綅 */
private Long unitId;
@@ -38,16 +41,25 @@
/** 澶囨敞 */
private String remark;
- private Short category;
-
/** 鐩戠閮ㄩ棬 */
private Long deptId;
private List<Long> deptIds;
private String deptName;
- /** 鐐逛綅鏍囩 */
- private String [] pointTags;
- private String pointTagString;
+ /** 閲嶇偣鐐逛綅鏍囩 */
+ private Boolean importantTag;
+
+ /** 鐪佸巺鐐逛綅鏍囩 */
+ 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