From cc3bbf14c5fde619c23e5502c8583889e94deacc Mon Sep 17 00:00:00 2001
From: jiaosong <jiaosong6760@dingtalk.com>
Date: 星期三, 25 十月 2023 09:58:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
server/services/src/main/java/com/doumee/dao/business/model/MemberRides.java | 7 +++++--
1 files changed, 5 insertions(+), 2 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..a39fb50 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 = "澶囨敞")
@@ -136,7 +135,7 @@
private String pricingDetailId;
@ApiModelProperty(value = "鏄惁鑺傚亣鏃� 0涓嶆槸 1鏄�")
- private String isHoliday;
+ private Integer isHoliday;
@ApiModelProperty(value = "杩樿溅绫诲瀷 0姝ｅ父杩樿溅 1寮哄埗杩樿溅")
@@ -151,4 +150,8 @@
@ApiModelProperty(value = "寮哄埗杩樿溅鎿嶄綔浜�(鍏宠仈system_user)")
private String backUserid;
+ @ApiModelProperty(value = "楠戣鏃堕暱")
+ @TableField(exist = false)
+ private Integer rideTime;
+
}
--
Gitblit v1.9.3