From 44c0ac235b54704e550b33c88cb597b8b1d00e01 Mon Sep 17 00:00:00 2001
From: eight <641137800@qq.com>
Date: 星期三, 14 八月 2024 17:56:19 +0800
Subject: [PATCH] update
---
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/appointment/AppointmentController.java | 8 --------
1 files changed, 0 insertions(+), 8 deletions(-)
diff --git a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/appointment/AppointmentController.java b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/appointment/AppointmentController.java
index d357c01..6b0f76d 100644
--- a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/appointment/AppointmentController.java
+++ b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/appointment/AppointmentController.java
@@ -215,22 +215,14 @@
List<RoomStatisticsDO> roomStatisticsList = roomService.roomStatistics();
roomStatisticsList.size();
-<<<<<<< HEAD
-=======
// 鑾峰彇 姣忎釜钀ヤ笟鐨勮瘖瀹� 鍊欒瘖鍑嗗鐨勫綋鍓嶄汉鏁� 灏辫瘖涓殑褰撳墠浜烘暟
// queueService.get
->>>>>>> c7362f7 (update)
List statusList = new ArrayList<Byte>();
statusList.add((byte)20);
statusList.add((byte)30);
List<QueueStatisticDO> queueStatisticDOList = queueService.queueStatistics(statusList);
queueStatisticDOList.size();
-<<<<<<< HEAD
-=======
-
-
->>>>>>> c7362f7 (update)
return success("hello");
}
}
--
Gitblit v1.9.3