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

cjl

2023-09-03 b3a56423e65c33c2c2cc905cb5a0b6af6f1601e7

 screen-manage/src/main/java/com/moral/api/service/MonitorPointService.java

@@ -4,6 +4,7 @@
import com.baomidou.mybatisplus.extension.service.IService;
import org.springframework.transaction.annotation.Transactional;

import java.util.List;
import java.util.Map;

/**
@@ -30,4 +31,6 @@

    Map<String,Object> getMonitorPointByFuzzy(Map map);

    List<MonitorPoint> getMonitorPointsByOrganizationId(Integer organizationId);

}