From f9691d544e62d6c04dbfe45d05a6c7bc5e004291 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 29 十二月 2023 11:52:29 +0800
Subject: [PATCH] 服务商

---
 server/services/src/main/java/com/doumee/dao/business/model/MemberRides.java |   18 ++++++++++++------
 1 files changed, 12 insertions(+), 6 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..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,19 +135,26 @@
     private String pricingDetailId;
 
     @ApiModelProperty(value = "鏄惁鑺傚亣鏃� 0涓嶆槸 1鏄�")
-    private String isHoliday;
+    private Integer isHoliday;
 
 
     @ApiModelProperty(value = "杩樿溅绫诲瀷 0姝e父杩樿溅 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 = "鎺掑簭鐮侊紙鍗囧簭锛�", example = "1")
+    @TableField(exist = false)
+    private Integer sortnum;
+
 }

--
Gitblit v1.9.3