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 |   20 +++++++++++++++++---
 1 files changed, 17 insertions(+), 3 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 7e08143..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
@@ -50,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 = "濂楅鍗℃姷鎵f椂闀匡紙鍒嗛挓锛�")
+    @ExcelColumn(name="濂楅鍗℃姷鎵f椂闀匡紙鍒嗛挓锛�",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;
 
@@ -123,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;
@@ -153,6 +164,9 @@
     @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