From 658ae28a31f1a8956893ff7b7b29d92c5fdb00f4 Mon Sep 17 00:00:00 2001
From: nidapeng <jp@doumee.com>
Date: 星期三, 03 四月 2024 10:20:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/1.0.1' into 1.0.1
---
server/service/src/main/java/com/doumee/dao/business/model/UnionChange.java | 29 +++++++++++++++++++++++++++++
1 files changed, 29 insertions(+), 0 deletions(-)
diff --git a/server/service/src/main/java/com/doumee/dao/business/model/UnionChange.java b/server/service/src/main/java/com/doumee/dao/business/model/UnionChange.java
index f9124b7..8b15110 100644
--- a/server/service/src/main/java/com/doumee/dao/business/model/UnionChange.java
+++ b/server/service/src/main/java/com/doumee/dao/business/model/UnionChange.java
@@ -9,6 +9,8 @@
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import com.fasterxml.jackson.annotation.JsonFormat;
+
+import java.math.BigDecimal;
import java.util.Date;
import java.util.List;
@@ -121,9 +123,36 @@
@TableField(exist = false)
private String companyNames;
+ @ApiModelProperty(value = "鏌ヨ寮�濮嬫棩鏈�", example = "1")
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ @TableField(exist = false)
+ private Date queryStartTime;
+
+ @ApiModelProperty(value = "鏌ヨ缁撴潫鏃ユ湡", example = "1")
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ @TableField(exist = false)
+ private Date queryEndTime;
+
+
@ApiModelProperty(value = "鏄庣粏琛岃褰�")
@TableField(exist = false)
private List<ApplyChagneDetail> applyChagneDetailList;
+ @ApiModelProperty(value = "鍔犱繚浜烘暟")
+ @TableField(exist = false)
+ private Integer addNum;
+
+ @ApiModelProperty(value = "鍑忎繚浜烘暟")
+ @TableField(exist = false)
+ private Integer delNum;
+
+ @ApiModelProperty(value = "鎹㈠巶浜烘暟")
+ @TableField(exist = false)
+ private Integer changeNum;
+
+
+ @ApiModelProperty(value = "鏃ュ織璁板綍")
+ @TableField(exist = false)
+ private List<ApplyLog> applyLogList;
}
--
Gitblit v1.9.3