From 0e12140d6ceac7fa10093df2d3ca395ee1501386 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期三, 07 八月 2024 14:14:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ycl-server/src/main/resources/mapper/zgyw/YwPointMapper.xml | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/ycl-server/src/main/resources/mapper/zgyw/YwPointMapper.xml b/ycl-server/src/main/resources/mapper/zgyw/YwPointMapper.xml
index 6395938..c57534a 100644
--- a/ycl-server/src/main/resources/mapper/zgyw/YwPointMapper.xml
+++ b/ycl-server/src/main/resources/mapper/zgyw/YwPointMapper.xml
@@ -79,7 +79,9 @@
m.name as pointName,
m.serial_number,
m.ip,
- yu.unit_name
+ yu.unit_name,
+ yp.start_time,
+ yp.end_time
FROM
t_yw_point yp
INNER JOIN t_monitor m ON yp.serial_number = m.serial_number
--
Gitblit v1.8.0