From 996154fb8fab5468cdfc99efbab606605fb762e1 Mon Sep 17 00:00:00 2001 From: jiangping <jp@doumee.com> Date: 星期一, 14 七月 2025 17:40:34 +0800 Subject: [PATCH] 前端 --- server/services/src/main/java/com/doumee/dao/business/model/MemberRevenue.java | 18 +++++++++++++++--- 1 files changed, 15 insertions(+), 3 deletions(-) diff --git a/server/services/src/main/java/com/doumee/dao/business/model/MemberRevenue.java b/server/services/src/main/java/com/doumee/dao/business/model/MemberRevenue.java index de8488d..5369aea 100644 --- a/server/services/src/main/java/com/doumee/dao/business/model/MemberRevenue.java +++ b/server/services/src/main/java/com/doumee/dao/business/model/MemberRevenue.java @@ -1,5 +1,6 @@ package com.doumee.dao.business.model; +import com.baomidou.mybatisplus.annotation.TableField; import com.doumee.core.annotation.excel.ExcelColumn; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -27,7 +28,7 @@ @ApiModelProperty(value = "鏄惁宸插垹闄� 0鏈垹闄� 1宸插垹闄�", example = "1") @ExcelColumn(name="鏄惁宸插垹闄� 0鏈垹闄� 1宸插垹闄�") - private Byte deleted; + private Integer deleted; @ApiModelProperty(value = "鍒涘缓浜虹紪鐮�", example = "1") @ExcelColumn(name="鍒涘缓浜虹紪鐮�") @@ -35,7 +36,6 @@ @ApiModelProperty(value = "鍒涘缓鏃堕棿") @ExcelColumn(name="鍒涘缓鏃堕棿") - @JsonFormat(pattern = "yyyy-MM-dd") private Date createTime; @ApiModelProperty(value = "鏇存柊浜虹紪鐮�", example = "1") @@ -44,7 +44,6 @@ @ApiModelProperty(value = "鏇存柊鏃堕棿") @ExcelColumn(name="鏇存柊鏃堕棿") - @JsonFormat(pattern = "yyyy-MM-dd") private Date updateTime; @ApiModelProperty(value = "澶囨敞") @@ -86,5 +85,18 @@ @ApiModelProperty(value = "涓氬姟鐘舵��:0=鎴愬姛锛�1=澶辫触锛�2=澶勭悊涓紱", example = "1") @ExcelColumn(name="涓氬姟鐘舵��:0=鎴愬姛锛�1=澶辫触锛�2=澶勭悊涓紱") private Integer status; + @ApiModelProperty(value = "鍙樺姩绫诲瀷:0=鐢ㄥ伐鍗曟敹鍏ワ紱1=璐ц繍鍗曟敹鍏ワ紱2=渚涢鍗曟敹鍏ワ紱3=鎻愮幇鐢宠锛�", example = "1") + @TableField(exist = false) + @ExcelColumn(name="鍙樺姩绫诲瀷:0=鐢ㄥ伐鍗曟敹鍏ワ紱1=璐ц繍鍗曟敹鍏ワ紱2=渚涢鍗曟敹鍏ワ紱3=鎻愮幇鐢宠锛�") + private String typeName; + @ApiModelProperty(value = "寰俊浜ゆ槗娴佹按鍙�", example = "1") + @ExcelColumn(name="寰俊浜ゆ槗娴佹按鍙�") + private String transactionNo; + @ApiModelProperty(value = "鍙樻煡璇㈠紑濮嬫椂闂�", example = "1") + @TableField(exist = false) + private Date startTime; + @ApiModelProperty(value = "鍙樻煡璇㈢粨鏉熸椂闂�", example = "1") + @TableField(exist = false) + private Date endTime; } -- Gitblit v1.9.3