From c51ab886ca899243f36cffe6c1a86d19057d44f5 Mon Sep 17 00:00:00 2001
From: zhangchao <zc857179121@qq.com>
Date: 星期六, 02 十一月 2024 11:18:38 +0800
Subject: [PATCH] 合并代码，解决冲突

---
 src/main/resources/mapper/ViewStayTimeMapper.xml |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

diff --git a/src/main/resources/mapper/ViewStayTimeMapper.xml b/src/main/resources/mapper/ViewStayTimeMapper.xml
index b4fbba3..7a0e299 100644
--- a/src/main/resources/mapper/ViewStayTimeMapper.xml
+++ b/src/main/resources/mapper/ViewStayTimeMapper.xml
@@ -178,5 +178,4 @@
 				) t
 		) a
 </select>
-
 </mapper>

--
Gitblit v1.9.1