From c6976365d5bfb39a32db8b541b1fe3ceb30c7826 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期五, 14 二月 2025 10:03:17 +0800
Subject: [PATCH] Merge branch 'dev'
---
ycl-pojo/src/main/java/com/ycl/platform/domain/entity/TContract.java | 10 ++++------
1 files changed, 4 insertions(+), 6 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 61dc0e0..eb47cd8 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
@@ -49,7 +49,7 @@
* 鍗曚綅id
*/
@NotBlank
- private Integer unitId;
+ private Long unitId;
@TableField(exist = false)
private String unitName;
@@ -63,14 +63,14 @@
/**
* 寮�濮嬫椂闂�
*/
- @JsonFormat(pattern = "yyyy-MM-dd hh-mm-ss")
+ @JsonFormat(pattern = "yyyy-MM-dd")
@NotNull
private Date startTime;
/**
* 缁撴潫鏃堕棿
*/
- @JsonFormat(pattern = "yyyy-MM-dd hh-mm-ss")
+ @JsonFormat(pattern = "yyyy-MM-dd")
@NotNull
private Date endTime;
@@ -84,13 +84,11 @@
private Date updateTime;
@TableLogic
- private String deleted;
+ private Integer deleted;
@TableField(exist = false)
- @NotBlank
private String ruleList;
@TableField(exist = false)
- @NotNull
private MultipartFile file;
}
--
Gitblit v1.8.0