From cd24a045bd9ee29505ddc9760d25f5d4037f4f0c Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期四, 05 九月 2024 21:55:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ycl-pojo/src/main/java/com/ycl/platform/domain/entity/TContract.java | 8 ++++----
1 files changed, 4 insertions(+), 4 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..26f4ee1 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,7 +84,7 @@
private Date updateTime;
@TableLogic
- private String deleted;
+ private Integer deleted;
@TableField(exist = false)
@NotBlank
--
Gitblit v1.8.0