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/form/YwPointForm.java | 26 ++++++++++++++++++++++----
1 files changed, 22 insertions(+), 4 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 2e36314..5514e75 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
@@ -1,9 +1,13 @@
package com.ycl.platform.domain.form;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.fasterxml.jackson.annotation.JsonFormat;
import com.ycl.system.domain.group.Update;
import com.ycl.system.domain.group.Add;
import com.ycl.platform.base.AbsForm;
import com.ycl.platform.domain.entity.YwPoint;
+import enumeration.general.ImportantTagEnum;
+import enumeration.general.ProvinceTagEnum;
import jakarta.validation.constraints.NotEmpty;
import org.springframework.beans.BeanUtils;
import jakarta.validation.constraints.NotBlank;
@@ -15,6 +19,7 @@
import lombok.experimental.Accessors;
import java.time.LocalDateTime;
+import java.util.Date;
import java.util.List;
/**
@@ -40,10 +45,10 @@
@ApiModelProperty("鐩戠閮ㄩ棬")
private Long deptId;
- @NotEmpty(message = "鐐逛綅鏍囩涓嶈兘涓虹┖", groups = {Add.class, Update.class})
- @ApiModelProperty("鐐逛綅鏍囩")
- private List<String> pointTag;
-
+ @ApiModelProperty("鐪佸巺鐐逛綅鏍囩")
+ private ProvinceTagEnum provinceTag;
+ @ApiModelProperty("閲嶇偣鐐逛綅鏍囩")
+ private ImportantTagEnum importantTag;
@ApiModelProperty("杩愮淮鐘舵��")
private String status;
@@ -53,6 +58,19 @@
@ApiModelProperty("绫诲瀷")
private Short category;
+ @ApiModelProperty("璁惧缂栧彿")
+ private String serialNumber;
+
+ @TableField("reason")
+ private String reason;
+
+ @TableField("recovery")
+ private Integer recovery;
+
+ @TableField("recovery_time")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date recoveryTime;
+
public static YwPoint getEntityByForm(@NonNull YwPointForm form, YwPoint entity) {
if(entity == null) {
entity = new YwPoint();
--
Gitblit v1.8.0