From 32b07077c733dce160ead4935e205e46755f3caf Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 10 十月 2023 16:48:03 +0800
Subject: [PATCH] 后台结算记录
---
server/services/src/main/java/com/doumee/dao/business/model/ActionLog.java | 27 +++++++++++++++++++++++----
1 files changed, 23 insertions(+), 4 deletions(-)
diff --git a/server/services/src/main/java/com/doumee/dao/business/model/ActionLog.java b/server/services/src/main/java/com/doumee/dao/business/model/ActionLog.java
index 5ad6827..0af2edf 100644
--- a/server/services/src/main/java/com/doumee/dao/business/model/ActionLog.java
+++ b/server/services/src/main/java/com/doumee/dao/business/model/ActionLog.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;
@@ -9,6 +10,7 @@
import lombok.Data;
import com.fasterxml.jackson.annotation.JsonFormat;
import java.util.Date;
+import java.util.List;
/**
* 绯荤粺琛屼负鎿嶄綔璁板綍琛�
@@ -58,9 +60,12 @@
@ExcelColumn(name="鍐呭")
private String content;
- @ApiModelProperty(value = "绫诲瀷 ", example = "1")
+ @ApiModelProperty(value = "绫诲瀷 0寮哄埗杩樿溅 1楠戣鏃堕暱淇敼", example = "1")
@ExcelColumn(name="绫诲瀷 ")
private Integer type;
+ @ApiModelProperty(value = "绫诲瀷闆嗗悎", example = "1")
+ @TableField(exist = false)
+ private List<Integer> typeList;
@ApiModelProperty(value = "鍏宠仈瀵硅薄缂栫爜")
@ExcelColumn(name="鍏宠仈瀵硅薄缂栫爜")
@@ -101,8 +106,22 @@
@ApiModelProperty(value = "鎿嶄綔缁撴灉 0鎴愬姛 1澶辫触", example = "1")
@ExcelColumn(name="鎿嶄綔缁撴灉 0鎴愬姛 1澶辫触")
private Integer result;
- @ApiModelProperty(value = "鎿嶄綔缁撴灉 0鎴愬姛 1澶辫触", example = "1")
- @ExcelColumn(name="鎿嶄綔缁撴灉 0鎴愬姛 1澶辫触")
- private Integer result;
+ @ApiModelProperty(value = "鎿嶄綔鍘熷洜")
+ private String actReason;
+
+ @ApiModelProperty(value = "鎿嶄綔澶囨敞")
+ private String actInfo;
+
+ @ApiModelProperty(value = "楠戣璁板綍瀵硅薄" )
+ @TableField(exist = false)
+ private MemberRides ridesObj;
+ @ApiModelProperty(value = "鏌ヨ寮�濮嬫棩鏈燂紙鍖呭惈锛�", example = "2023-10-01 15:12:01")
+ @TableField(exist = false)
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date startDate;
+ @ApiModelProperty(value = "鏌ヨ鎴鏃ユ湡锛堝寘鍚級", example = "2023-10-09 15:12:05")
+ @TableField(exist = false)
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date endDate;
}
--
Gitblit v1.9.3