From ae347a6603c94f73462c9c3e39c3e04476556d6e Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期三, 19 二月 2025 11:05:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
business/src/main/java/com/ycl/domain/form/ProjectPlanExamineRecordForm.java | 24 ++++++++++++++++--------
1 files changed, 16 insertions(+), 8 deletions(-)
diff --git a/business/src/main/java/com/ycl/domain/form/ProjectPlanExamineRecordForm.java b/business/src/main/java/com/ycl/domain/form/ProjectPlanExamineRecordForm.java
index f792303..5eede94 100644
--- a/business/src/main/java/com/ycl/domain/form/ProjectPlanExamineRecordForm.java
+++ b/business/src/main/java/com/ycl/domain/form/ProjectPlanExamineRecordForm.java
@@ -1,18 +1,16 @@
package com.ycl.domain.form;
-
-import com.ycl.common.group.Add;
import com.ycl.common.group.Update;
-import com.ycl.domain.entity.ProjectPlanExamineRecord;
+import com.ycl.common.group.Add;
import com.ycl.system.domain.base.AbsForm;
+import com.ycl.domain.entity.ProjectPlanExamineRecord;
+import org.springframework.beans.BeanUtils;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import org.springframework.lang.NonNull;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
-import org.springframework.beans.BeanUtils;
-import org.springframework.lang.NonNull;
-
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
import java.util.Date;
/**
@@ -28,6 +26,8 @@
@NotNull(message = "椤圭洰璁″垝璁板綍id涓嶈兘涓虹┖", groups = {Add.class, Update.class})
@ApiModelProperty("椤圭洰璁″垝璁板綍id")
private Long projectPlanRecordId;
+
+ private Long projectPlanInfoId;
@NotNull(message = "涓婄骇閮ㄩ棬瀹℃牳浜轰笉鑳戒负绌�", groups = {Add.class, Update.class})
@ApiModelProperty("涓婄骇閮ㄩ棬瀹℃牳浜�")
@@ -73,6 +73,14 @@
@ApiModelProperty("寤舵湡缁撴潫鏃堕棿")
private Date delayEndTime;
+ @NotNull(message = "鍒涘缓鏃堕棿涓嶈兘涓虹┖", groups = {Add.class, Update.class})
+ @ApiModelProperty("鍒涘缓鏃堕棿")
+ private Date gmtCreateTime;
+
+ @NotNull(message = "淇敼鏃堕棿涓嶈兘涓虹┖", groups = {Add.class, Update.class})
+ @ApiModelProperty("淇敼鏃堕棿")
+ private Date gmtUpdateTime;
+
public static ProjectPlanExamineRecord getEntityByForm(@NonNull ProjectPlanExamineRecordForm form, ProjectPlanExamineRecord entity) {
if(entity == null) {
entity = new ProjectPlanExamineRecord();
--
Gitblit v1.8.0