From 69283b5a4559509187516355602e32e4bdac9d5d Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 28 二月 2025 11:54:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0.1' into 2.0.1
---
server/services/src/main/java/com/doumee/dao/business/web/response/BikeLogDTO.java | 14 +++++++++++---
1 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/server/services/src/main/java/com/doumee/dao/business/web/response/BikeLogDTO.java b/server/services/src/main/java/com/doumee/dao/business/web/response/BikeLogDTO.java
index 513d3ec..ee0fb23 100644
--- a/server/services/src/main/java/com/doumee/dao/business/web/response/BikeLogDTO.java
+++ b/server/services/src/main/java/com/doumee/dao/business/web/response/BikeLogDTO.java
@@ -1,10 +1,12 @@
package com.doumee.dao.business.web.response;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.doumee.core.annotation.excel.ExcelColumn;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.apache.poi.ss.usermodel.HorizontalAlignment;
+import java.math.BigDecimal;
import java.util.Date;
/**
@@ -27,6 +29,8 @@
@ApiModelProperty(value = "杞﹁締绫诲瀷")
@ExcelColumn(name="杞﹁締绫诲瀷",index = 3,width = 10,align = HorizontalAlignment.CENTER)
private String bikeType;
+ @ApiModelProperty(value = "杞﹁締绫诲瀷缂栫爜")
+ private String paramId;
@ApiModelProperty(value = "绉熻溅绔欑偣缂栫爜")
@ExcelColumn(name="鍊熷嚭绔欑偣",index = 4,width = 10,align = HorizontalAlignment.CENTER)
@@ -37,7 +41,7 @@
private String rentLockId;
@ApiModelProperty(value = "楠戣鏃堕暱")
- @ExcelColumn(name="鍊熷嚭鏃堕暱",index = 8,width = 10,align = HorizontalAlignment.CENTER)
+ @ExcelColumn(name="鍊熷嚭鏃堕暱(鍒�)",index = 8,width = 10,align = HorizontalAlignment.CENTER)
private Integer rideTime;
@ApiModelProperty(value = "璁¤垂鏃堕暱")
// @ExcelColumn(name="璁¤垂鏃堕暱",index = 8,width = 10,align = HorizontalAlignment.CENTER)
@@ -51,6 +55,8 @@
@ExcelColumn(name="褰掕繕绔欑偣",index = 10,width = 10,align = HorizontalAlignment.CENTER)
private String backSiteId;
+ @ApiModelProperty(value = "楠戣鍗℃姷鎵�(鍒嗭級")
+ private BigDecimal discountPrice;
@ApiModelProperty(value = "杩樿溅閿佸ご缂栫爜")
@ExcelColumn(name="褰掕繕閿佸叿",index = 12,width = 10,align = HorizontalAlignment.CENTER)
private String backLockId;
@@ -60,10 +66,12 @@
private Date backDate;
@ApiModelProperty(value = "鐘舵�� 0璇锋眰寮�閿佷腑 1楠戣涓� 2宸茶繕杞� 3寮�閿佸け璐�")
- @ExcelColumn(name="鐘舵�� ", valueMapping = "0=璇锋眰寮�閿佷腑;1=楠戣涓�;2=宸茶繕杞�;3=寮�閿佸け璐�;" ,width = 10,align = HorizontalAlignment.CENTER)
+// @ExcelColumn(name="鐘舵�� ", valueMapping = "0=璇锋眰寮�閿佷腑;1=楠戣涓�;2=宸茶繕杞�;3=寮�閿佸け璐�;" ,width = 10,align = HorizontalAlignment.CENTER)
private Integer status;
+ @ApiModelProperty(value = "杞﹁締绫诲瀷 0鑷杞� 1鐢佃溅")
+ private Integer type;
@ApiModelProperty(value = "缁撶畻鐘舵��")
- @ExcelColumn(name="缁撶畻鐘舵�� ", valueMapping = "0=鏈粨绠�;1=宸茬粨绠�;" ,width = 10,align = HorizontalAlignment.CENTER)
+// @ExcelColumn(name="缁撶畻鐘舵�� ", valueMapping = "0=鏈粨绠�;1=宸茬粨绠�;" ,width = 10,align = HorizontalAlignment.CENTER)
private Integer closeStatus;
}
--
Gitblit v1.9.3