From 3e7932d378b607f75379b463ae4ae2f4f1ccfe12 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期三, 18 六月 2025 10:31:30 +0800
Subject: [PATCH] Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/HongRuiTang into 2.0

---
 ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/poji/shop/ShopNonAppointableTime.java |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/poji/shop/ShopNonAppointableTime.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/poji/shop/ShopNonAppointableTime.java
index 379f7e8..a307341 100644
--- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/poji/shop/ShopNonAppointableTime.java
+++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/poji/shop/ShopNonAppointableTime.java
@@ -8,6 +8,8 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.time.LocalDateTime;
+
 /**
  * @author zhibing.pu
  * @Date 2025/5/26 14:25
@@ -31,11 +33,11 @@
 	 */
 	@TableField("non_appointable_start_time")
 	@ApiModelProperty("不可预约开始时间")
-	private String nonAppointableStartTime;
+	private LocalDateTime nonAppointableStartTime;
 	/**
 	 * 不可预约结束时间
 	 */
 	@TableField("non_appointable_end_time")
 	@ApiModelProperty("不可预约结束时间")
-	private String nonAppointableEndTime;
+	private LocalDateTime nonAppointableEndTime;
 }

--
Gitblit v1.7.1