From a894bc6373154d5cfd28b7f46df3c4cfa01a7b9b Mon Sep 17 00:00:00 2001 From: liusheng <337615773@qq.com> Date: 星期三, 24 四月 2024 11:46:33 +0800 Subject: [PATCH] 代码提交 --- ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceDonorcharge.java | 25 ++++++++++++++++--------- 1 files changed, 16 insertions(+), 9 deletions(-) diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceDonorcharge.java b/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceDonorcharge.java index 4c87d93..922c7b4 100644 --- a/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceDonorcharge.java +++ b/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceDonorcharge.java @@ -1,15 +1,16 @@ package com.ruoyi.project.domain; -import java.math.BigDecimal; -import java.util.Date; -import com.fasterxml.jackson.annotation.JsonFormat; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; +import com.fasterxml.jackson.annotation.JsonFormat; import com.ruoyi.common.annotation.Excel; import com.ruoyi.common.core.domain.BaseEntity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; + +import java.math.BigDecimal; +import java.util.Date; /** * 鎹愮尞妗堜緥鍣ㄥ畼鍒楀璞� service_donorcharge @@ -41,8 +42,8 @@ /** 鎹愮尞鏃堕棿 */ @ApiModelProperty("鎹愮尞鏃堕棿") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @Excel(name = "鎹愮尞鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "鎹愮尞鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd") private Date donatetime; /** 濮撳悕 */ @@ -52,8 +53,8 @@ /** 鍑虹敓骞存湀 */ @ApiModelProperty("鍑虹敓骞存湀") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @Excel(name = "鍑虹敓骞存湀", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "鍑虹敓骞存湀", width = 30, dateFormat = "yyyy-MM-dd") private Date borthdate; /** 鎬у埆 */ @@ -67,8 +68,8 @@ private String age; /** 鎹愮尞绫诲埆 鏍规嵁瀛楀吀sys_DonationCategory */ - @ApiModelProperty("鎹愮尞绫诲埆 鏍规嵁瀛楀吀sys_DonationCategory") - @Excel(name = "鎹愮尞绫诲埆 鏍规嵁瀛楀吀sys_DonationCategory") + @ApiModelProperty("鎹愮尞绫诲埆") + @Excel(name = "鎹愮尞绫诲埆") private String donationcategory; /** 鎹愮尞鐨勫櫒瀹� */ @@ -86,5 +87,11 @@ @Excel(name = "鍚堣瀹為檯鑾峰彇璐圭敤") private BigDecimal chargeamounted; + + /** 鎹愮尞鐨勫櫒瀹� */ + @ApiModelProperty("澶囨敞") + @Excel(name = "澶囨敞") + private String remark; + } -- Gitblit v1.9.3