From 65f4876957d95740104b49af7ead3a2d0c2156b6 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期四, 19 十月 2023 14:04:48 +0800
Subject: [PATCH] Merge branch 'dev' of http://139.186.142.91:10010/r/productDev/parkBike into dev

---
 server/services/src/main/java/com/doumee/dao/business/model/MemberRides.java |    2 +-
 1 files changed, 1 insertions(+), 1 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 0bc10bf..8d508cd 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
@@ -136,7 +136,7 @@
     private String pricingDetailId;
 
     @ApiModelProperty(value = "鏄惁鑺傚亣鏃� 0涓嶆槸 1鏄�")
-    private String isHoliday;
+    private Integer isHoliday;
 
 
     @ApiModelProperty(value = "杩樿溅绫诲瀷 0姝e父杩樿溅 1寮哄埗杩樿溅")

--
Gitblit v1.9.3