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

jinpengyong

2022-01-17 3ddfa12fbc43e80e99e4959fbac8881eaa8e3ca3

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

@@ -64,4 +64,13 @@
    //判断并修改设备状态
    void judgeDeviceState(Map<String, Object> data);

    /**
      *@Description: 通过组织id获取站点和设备
      *@Param: [orgId]
      *@return: java.util.List<java.util.Map<java.lang.String,java.lang.Object>> 
      *@Author: lizijie
      *@Date: 2022/1/17 10:30
     **/
    List<Map<String,Object>> selectMonitorPiontAndDeviceByOrgId(int orgId);

}