From 2dc478231fd09a88a4d86d44388ae807aca08bc5 Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期三, 01 一月 2025 10:14:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
medicalWaste-system/src/main/java/com/sinata/system/domain/dto/MwContractDTO.java | 7 +++++++
1 files changed, 7 insertions(+), 0 deletions(-)
diff --git a/medicalWaste-system/src/main/java/com/sinata/system/domain/dto/MwContractDTO.java b/medicalWaste-system/src/main/java/com/sinata/system/domain/dto/MwContractDTO.java
index 32cd2b2..f326490 100644
--- a/medicalWaste-system/src/main/java/com/sinata/system/domain/dto/MwContractDTO.java
+++ b/medicalWaste-system/src/main/java/com/sinata/system/domain/dto/MwContractDTO.java
@@ -1,5 +1,6 @@
package com.sinata.system.domain.dto;
+import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -39,10 +40,12 @@
@ApiModelProperty("合同生效日期")
@NotNull(message = "合同生效日期不能为空")
+ @JsonFormat(pattern = "yyyy-MM-dd")
private Date effectiveDate;
@ApiModelProperty("合同终止日期")
@NotNull(message = "合同终止日期不能为空")
+ @JsonFormat(pattern = "yyyy-MM-dd")
private Date terminationDate;
@ApiModelProperty("甲方名称")
@@ -74,4 +77,8 @@
@ApiModelProperty("附件列表")
private List<MwAttachmentDTO> attachmentList;
+
+ @ApiModelProperty("层级关系")
+ @NotBlank(message = "层级关系不能为空")
+ private String relation;
}
--
Gitblit v1.7.1