From f6722e13ba28cd292c162df9292bb3418ba12bec Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期三, 25 六月 2025 15:17:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0.1' into 2.0.1
---
server/service/src/main/java/com/doumee/dao/business/dto/UnionChangeBXDDTO.java | 23 ++++++++++++++++++++---
1 files changed, 20 insertions(+), 3 deletions(-)
diff --git a/server/service/src/main/java/com/doumee/dao/business/dto/UnionChangeBXDDTO.java b/server/service/src/main/java/com/doumee/dao/business/dto/UnionChangeBXDDTO.java
index b33d8d9..a6b0881 100644
--- a/server/service/src/main/java/com/doumee/dao/business/dto/UnionChangeBXDDTO.java
+++ b/server/service/src/main/java/com/doumee/dao/business/dto/UnionChangeBXDDTO.java
@@ -1,5 +1,7 @@
package com.doumee.dao.business.dto;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.doumee.dao.business.model.Multifile;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -19,17 +21,32 @@
@ApiModelProperty(value = "鍚堝苟鍗曚富閿�")
private Integer id;
+ @ApiModelProperty(value = "鎶曚繚鐢宠鍗曞悎骞跺崟涓婚敭")
+ private Integer applyId;
+
@ApiModelProperty(value = "淇濆崟鍙�")
private String code;
- @ApiModelProperty(value = "鎵瑰崟鏃ユ湡")
+ @ApiModelProperty(value = "鎵瑰崟鏃ユ湡(鍔犱繚鎵瑰崟鏃ユ湡)")
@JsonFormat(pattern = "yyyy-MM-dd")
private Date applyDate;
+ @ApiModelProperty(value = "鍑忎繚鎵瑰崟鏃ユ湡")
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ private Date delValidTime;
+
@ApiModelProperty(value = "淇濆崟鏂囦欢鍦板潃")
- private String fileUrl;
+ private String fileurl;
@ApiModelProperty(value = "淇濆崟鏂囦欢鍚嶇О")
- private String fileName;
+ private String name;
+
+ @ApiModelProperty(value = "鍔犲噺淇� 淇濆崟鏂囦欢鏁版嵁")
+ private List<Multifile> applyChangeBXDList;
+
+
+ @ApiModelProperty(value = "鎵瑰崟闄勪欢鍒楄〃")
+ @TableField(exist = false)
+ private List<Multifile> pidanFileList;
}
--
Gitblit v1.9.3