Merge remote-tracking branch 'origin/master'

fuliqi

2024-08-07 0e12140d6ceac7fa10093df2d3ca395ee1501386

 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