From e2edaf30f4bf2213fe55c9817980001a1ea23e9f Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期三, 19 二月 2025 09:26:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
ycl-pojo/src/main/java/com/ycl/platform/domain/form/YwPointForm.java | 24 +++++++++++++++++++++---
1 files changed, 21 insertions(+), 3 deletions(-)
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/form/YwPointForm.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/form/YwPointForm.java
index 6137eef..78f45f2 100644
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/form/YwPointForm.java
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/form/YwPointForm.java
@@ -32,7 +32,6 @@
@ApiModelProperty("鐐逛綅鍚嶇О")
private String pointName;
- @NotNull(message = "杩愮淮鍗曚綅涓嶈兘涓虹┖", groups = {Add.class, Update.class})
@ApiModelProperty("杩愮淮鍗曚綅")
private Integer unitId;
@@ -40,14 +39,21 @@
@ApiModelProperty("鐩戠閮ㄩ棬")
private Long deptId;
- @ApiModelProperty("鐪佸巺鐐逛綅鏍囩")
- private Boolean provinceTag;
+ @ApiModelProperty("鐪佸巺瑙嗛鐐逛綅鏍囩")
+ private Boolean provinceTagVideo;
+ @ApiModelProperty("鐪佸巺杞﹁締鐐逛綅鏍囩")
+ private Boolean provinceTagCar;
+ @ApiModelProperty("鐪佸巺浜鸿劯鐐逛綅鏍囩")
+ private Boolean provinceTagFace;
@ApiModelProperty("閲嶇偣鐐逛綅鏍囩")
private Boolean importantTag;
@ApiModelProperty("閲嶇偣鎸囨尌鍥惧儚鏍囩")
private Boolean importantCommandImageTag;
+
+ @ApiModelProperty("閮ㄧ骇鏍囩")
+ private Boolean deptTag;
@ApiModelProperty("杩愮淮鐘舵��")
private String status;
@@ -68,6 +74,18 @@
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date recoveryTime;
+ @ApiModelProperty("鐐逛綅寮�濮嬫椂闂�")
+ @TableField("start_time")
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ private Date startTime;
+
+ @ApiModelProperty("鐐逛綅缁撴潫鏃堕棿")
+ @TableField("end_time")
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ private Date endTime;
+
+ private String username;
+ private String password;
public static YwPoint getEntityByForm(@NonNull YwPointForm form, YwPoint entity) {
if(entity == null) {
entity = new YwPoint();
--
Gitblit v1.8.0