From 128e967421ce351644b3913ca9be5c0d909609c6 Mon Sep 17 00:00:00 2001 From: nidapeng <jp@doumee.com> Date: 星期五, 29 三月 2024 16:18:35 +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 | 23 +++++++++++++++++++++++ 1 files changed, 23 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..d73a164 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,30 @@ @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; } -- Gitblit v1.9.3