From 25d47cb937792b48690d5ccdd8aa06b202cd0967 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期一, 30 六月 2025 14:35:20 +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/TShopAppointableTime.java |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/poji/shop/TShopAppointableTime.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/poji/shop/TShopAppointableTime.java
index 834de6a..f1a995f 100644
--- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/poji/shop/TShopAppointableTime.java
+++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/poji/shop/TShopAppointableTime.java
@@ -33,8 +33,8 @@
 	/**
 	 * 预约时间
 	 */
-	@TableField("appointable_time")
-	private LocalDateTime appointableTime;
+	@TableField("appointment_time")
+	private LocalDateTime appointmentTime;
 	/**
 	 * 状态(0=已取消,1=待确认,2=等待中,3=已结束)
 	 */

--
Gitblit v1.7.1