From 1b0cf0db5c82ea8308d2f338973a91555787c34d Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 18 三月 2025 11:17:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
server/services/src/main/java/com/doumee/dao/business/model/MemberRides.java | 14 ++++++++++----
1 files changed, 10 insertions(+), 4 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 c7849ce..7e08143 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 = "澶囨敞")
@@ -73,7 +72,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 +87,7 @@
@ApiModelProperty(value = "杩樿溅閿佸ご缂栫爜")
@ExcelColumn(name="褰掕繕閿佸叿",index = 8,width = 10,align = HorizontalAlignment.CENTER)
- private String backLockId;
+ private Integer backLockId;
@ApiModelProperty(value = "杩樿溅鏃堕棿")
private Date backDate;
@@ -136,7 +135,7 @@
private String pricingDetailId;
@ApiModelProperty(value = "鏄惁鑺傚亣鏃� 0涓嶆槸 1鏄�")
- private String isHoliday;
+ private Integer isHoliday;
@ApiModelProperty(value = "杩樿溅绫诲瀷 0姝ｅ父杩樿溅 1寮哄埗杩樿溅")
@@ -151,4 +150,11 @@
@ApiModelProperty(value = "寮哄埗杩樿溅鎿嶄綔浜�(鍏宠仈system_user)")
private String backUserid;
+ @ApiModelProperty(value = "楠戣鏃堕暱")
+ @TableField(exist = false)
+ private Integer rideTime;
+ @ApiModelProperty(value = "鎺掑簭鐮侊紙鍗囧簭锛�", example = "1")
+ @TableField(exist = false)
+ private Integer sortnum;
+
}
--
Gitblit v1.9.3