From ae940502b8431e4773d030bc9cb2d05f0ec6cecf Mon Sep 17 00:00:00 2001 From: yxh <172933527@qq.com> Date: 星期三, 10 五月 2023 21:22:51 +0800 Subject: [PATCH] Merge branch 'master' of http://116.62.18.175:6699/r/~yxh/opo --- ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceReimbursement.java | 15 +++++++++++---- 1 files changed, 11 insertions(+), 4 deletions(-) diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceReimbursement.java b/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceReimbursement.java index 306348c..5e998e3 100644 --- a/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceReimbursement.java +++ b/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceReimbursement.java @@ -9,7 +9,6 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.math.BigDecimal; import java.util.Date; /** @@ -221,12 +220,20 @@ private String donorremark; @ApiModelProperty("鎹愮尞瀹跺睘璐圭敤閲戦") - private BigDecimal donoramount; + private Double donoramount; @ApiModelProperty("鎹愮尞瀹跺睘浜烘暟") private Integer donorrelatives; - @ApiModelProperty("鎹愮尞瀹跺睘鏀舵浜�") - private String donorpayee; + + + @ApiModelProperty("鐢宠鏃堕棿") + private Date createTime; + +// @ApiModelProperty("寮�濮嬫椂闂�") +// private Date starttime; +// +// @ApiModelProperty("缁撴潫鏃堕棿") +// private Date endtime; } -- Gitblit v1.9.3