From 387d3aca6fab1a07618bb8342ee522b3da2db9b1 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期日, 28 四月 2024 10:09:26 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ycl-pojo/src/main/java/com/ycl/platform/domain/entity/TContract.java | 24 ++++++++++++++++++++++++
1 files changed, 24 insertions(+), 0 deletions(-)
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/TContract.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/TContract.java
index e4c77d9..61dc0e0 100644
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/TContract.java
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/TContract.java
@@ -9,9 +9,22 @@
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableLogic;
import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.core.JsonParser;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.core.type.TypeReference;
+import com.fasterxml.jackson.databind.DeserializationContext;
+import com.fasterxml.jackson.databind.JsonDeserializer;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
import lombok.Data;
+import org.springframework.web.multipart.MultipartFile;
+import java.io.IOException;
+import java.util.Arrays;
import java.util.Date;
+import java.util.List;
/**
* 杩愮淮鍚堝悓瀵硅薄 t_contract
@@ -35,6 +48,7 @@
/**
* 鍗曚綅id
*/
+ @NotBlank
private Integer unitId;
@TableField(exist = false)
@@ -43,18 +57,21 @@
/**
* 鍚堝悓鍚嶇О
*/
+ @NotBlank
private String name;
/**
* 寮�濮嬫椂闂�
*/
@JsonFormat(pattern = "yyyy-MM-dd hh-mm-ss")
+ @NotNull
private Date startTime;
/**
* 缁撴潫鏃堕棿
*/
@JsonFormat(pattern = "yyyy-MM-dd hh-mm-ss")
+ @NotNull
private Date endTime;
/**
@@ -69,4 +86,11 @@
@TableLogic
private String deleted;
+ @TableField(exist = false)
+ @NotBlank
+ private String ruleList;
+ @TableField(exist = false)
+ @NotNull
+ private MultipartFile file;
+
}
--
Gitblit v1.8.0