Merge remote-tracking branch 'origin/cjl' into qa

cjl

2023-08-18 571872dd803244bcef2b789e93f3061af00db402

 screen-api/src/main/java/com/moral/api/service/impl/MonitorPointServiceImpl.java

@@ -481,8 +481,6 @@
        }
        return resultList;
    }


    @Override
    public List<MonitoringStationDTO> listMonitoringStationDTO(Map<String, Object> params, int reportType, String startTime, String endTime) {
       // List<String> macs = Arrays.asList(mac.split(","));