From 4b1453e19306592f703aa794e238bd028f67d320 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期五, 24 一月 2025 16:20:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0' into 2.0
---
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/BallController.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/BallController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/BallController.java
index 486d23e..e05f07f 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/BallController.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/BallController.java
@@ -868,6 +868,7 @@
@Autowired
private IUserService userService;
+
@RequestMapping("/yueyue_info/{id}")
public String yueyue_info(@PathVariable("id") Integer id,Model model) {
@@ -933,8 +934,7 @@
List<OrderDto> timeRanges = new ArrayList<>();
-
- Site site = siteClient.listById(book.getSiteId());
+ TSite site = siteService.getById(book.getSiteId());
System.out.println("================"+site);
String appointmentStartTime = site.getAppointmentStartTime();
String appointmentEndTime = site.getAppointmentEndTime();
--
Gitblit v1.7.1