From 9d67b4462bf494a0b25c1b40be8198f71666131e Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 18 二月 2025 14:39:26 +0800
Subject: [PATCH] jtt808初始化
---
server/services/src/main/java/com/doumee/dao/business/model/MemberRides.java | 24 +++++++++++++++++++-----
1 files changed, 19 insertions(+), 5 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 d41374d..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 = "濂楅鍗℃姷鎵ｆ椂闀匡紙鍒嗛挓锛�")
+ @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;
@@ -72,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)
@@ -87,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;
@@ -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