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

cjl

2024-03-28 33b9d2c203a9998272088ecdf43a15dd53669967

 screen-api/src/main/java/com/moral/api/mapper/MonitorPointMapper.java

@@ -4,6 +4,7 @@

import com.moral.api.entity.MonitorPoint;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.moral.api.pojo.vo.monitorPoint.MonitorPointVos;

/**
 * <p>
@@ -17,4 +18,5 @@

    List<Integer> getMonitorPointiId(Integer id);

    List<MonitorPointVos> getMonitorPoint(Integer id);
}