From 4fabfe4dbd2eb28d07a4350597d314958cc1c281 Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期四, 09 十月 2025 11:16:43 +0800
Subject: [PATCH] 优化
---
server/services/src/main/java/com/doumee/dao/business/model/MemberRides.java | 38 +++++++++++++++++++++++++++++---------
1 files changed, 29 insertions(+), 9 deletions(-)
diff --git a/server/services/src/main/java/com/doumee/dao/business/model/MemberRides.java b/server/services/src/main/java/com/doumee/dao/business/model/MemberRides.java
index 633f2be..3728dac 100644
--- a/server/services/src/main/java/com/doumee/dao/business/model/MemberRides.java
+++ b/server/services/src/main/java/com/doumee/dao/business/model/MemberRides.java
@@ -37,7 +37,6 @@
private String editor;
@ApiModelProperty(value = "鏄惁宸插垹闄� 0鏈垹闄� 1宸插垹闄�")
- @TableLogic
private Integer isdeleted;
@ApiModelProperty(value = "澶囨敞")
@@ -51,11 +50,22 @@
@TableField(exist = false)
private String memberOpenid;
-
+ @ApiModelProperty(value = "杞﹁締绫诲瀷 0鑷杞� 1鐢佃溅")
+ @ExcelColumn(name="杞﹁締绫诲瀷 0鑷杞� 1鐢佃溅")
+ private Integer type;
@ApiModelProperty(value = "杞﹁締缂栫爜")
@ExcelColumn(name="杞﹁締缂栫爜",index = 2,width = 10,align = HorizontalAlignment.CENTER)
private String bikeCode;
-
+ @ApiModelProperty(value = "濂楅鍗℃姷鎵ｆ椂闀匡紙鍒嗛挓锛�")
+ @ExcelColumn(name="濂楅鍗℃姷鎵ｆ椂闀匡紙鍒嗛挓锛�",index = 12, align = HorizontalAlignment.CENTER)
+ private String discountTime;
+ @ApiModelProperty(value = "濂楅鍗＄紪鐮侊紙鍏宠仈discount_member_id)")
+ private String discountMemberId;
+ @ApiModelProperty(value = "濂楅鎶垫墸浠锋牸锛堝厓锛�")
+ @ExcelColumn(name="濂楅鎶垫墸浠锋牸锛堝厓锛�",index = 13, align = HorizontalAlignment.CENTER)
+ private BigDecimal discountPrice;
+ @ApiModelProperty(value = "涓存椂鍋滆溅寮�濮嬫椂闂�")
+ private Date pauseDate;
@ApiModelProperty(value = "褰撳墠璐︽埛浣欓")
private BigDecimal balance;
@@ -73,7 +83,7 @@
@ApiModelProperty(value = "绉熻溅閿佸ご缂栫爜")
@ExcelColumn(name="绉熻溅閿佸叿",index = 5,width = 10,align = HorizontalAlignment.CENTER)
- private String rentLockId;
+ private Integer rentLockId;
@ApiModelProperty(value = "绉熻溅鏃堕棿")
@ExcelColumn(name="绉熻溅鏃堕棿",index = 6,width = 10,align = HorizontalAlignment.CENTER)
@@ -88,7 +98,7 @@
@ApiModelProperty(value = "杩樿溅閿佸ご缂栫爜")
@ExcelColumn(name="褰掕繕閿佸叿",index = 8,width = 10,align = HorizontalAlignment.CENTER)
- private String backLockId;
+ private Integer backLockId;
@ApiModelProperty(value = "杩樿溅鏃堕棿")
private Date backDate;
@@ -124,7 +134,7 @@
@ApiModelProperty(value = "缁撶畻鐘舵�� 0鏈粨绠� 1宸茬粨鏉�")
private Integer closeStatus;
- @ApiModelProperty(value = "鐘舵�� 0璇锋眰寮�閿佷腑 1楠戣涓� 2宸茶繕杞� 3寮�閿佸け璐�")
+ @ApiModelProperty(value = "鐘舵�� 0璇锋眰寮�閿佷腑 1楠戣涓� 2宸茶繕杞� 3寮�閿佸け璐� 4涓存椂閿佽溅")
private Integer status;
@ApiModelProperty(value = "鍏宠仈璁㈠崟缂栫爜(鍏宠仈goodsorder锛�")
private String ordreId;
@@ -136,19 +146,29 @@
private String pricingDetailId;
@ApiModelProperty(value = "鏄惁鑺傚亣鏃� 0涓嶆槸 1鏄�")
- private String isHoliday;
+ private Integer isHoliday;
@ApiModelProperty(value = "杩樿溅绫诲瀷 0姝ｅ父杩樿溅 1寮哄埗杩樿溅")
private Integer backType;
- @ApiModelProperty(value = "杩樿溅鍘熷洜")
+ @ApiModelProperty(value = "杩樿溅鍘熷洜(鍑忓厤鏃堕暱鍘熷洜涔熶娇鐢ㄨ鍙傛暟浼犲��)")
private String backReason;
- @ApiModelProperty(value = "杩樿溅澶囨敞")
+ @ApiModelProperty(value = "杩樿溅澶囨敞(鍑忓厤鏃堕暱澶囨敞涔熶娇鐢ㄨ鍙傛暟浼犲��)")
private String backInfo;
@ApiModelProperty(value = "寮哄埗杩樿溅鎿嶄綔浜�(鍏宠仈system_user)")
private String backUserid;
+ @ApiModelProperty(value = "楠戣鏃堕暱")
+ @TableField(exist = false)
+ private Integer rideTime;
+ @ApiModelProperty(value = "鎺у埗鍣ㄧ紪鐮�")
+ @TableField(exist = false)
+ private String deviceSn;
+ @ApiModelProperty(value = "鎺掑簭鐮侊紙鍗囧簭锛�", example = "1")
+ @TableField(exist = false)
+ private Integer sortnum;
+
}
--
Gitblit v1.9.3