From 439139cf650de7ccb0c91b2ffbda08e2273bc7b5 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期六, 24 八月 2024 18:45:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ycl-pojo/src/main/java/com/ycl/platform/domain/form/YwPointForm.java | 17 ++++++++---------
1 files changed, 8 insertions(+), 9 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 76deb13..6137eef 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
@@ -6,7 +6,6 @@
import com.ycl.system.domain.group.Add;
import com.ycl.platform.base.AbsForm;
import com.ycl.platform.domain.entity.YwPoint;
-import jakarta.validation.constraints.NotEmpty;
import org.springframework.beans.BeanUtils;
import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.NotNull;
@@ -16,9 +15,7 @@
import lombok.Data;
import lombok.experimental.Accessors;
-import java.time.LocalDateTime;
import java.util.Date;
-import java.util.List;
/**
* 杩愮淮鐐逛綅琛ㄥ崟
@@ -43,18 +40,20 @@
@ApiModelProperty("鐩戠閮ㄩ棬")
private Long deptId;
- @NotEmpty(message = "鐐逛綅鏍囩涓嶈兘涓虹┖", groups = {Add.class, Update.class})
- @ApiModelProperty("鐐逛綅鏍囩")
- private List<String> pointTag;
+ @ApiModelProperty("鐪佸巺鐐逛綅鏍囩")
+ private Boolean provinceTag;
+
+ @ApiModelProperty("閲嶇偣鐐逛綅鏍囩")
+ private Boolean importantTag;
+
+ @ApiModelProperty("閲嶇偣鎸囨尌鍥惧儚鏍囩")
+ private Boolean importantCommandImageTag;
@ApiModelProperty("杩愮淮鐘舵��")
private String status;
@ApiModelProperty("澶囨敞")
private String remark;
-
- @ApiModelProperty("绫诲瀷")
- private Short category;
@ApiModelProperty("璁惧缂栧彿")
private String serialNumber;
--
Gitblit v1.8.0