Merge branch 'master' of F:\moral\moral\screen_api_v2 with conflicts.

JinPengYong

2020-04-26 3df4f24049c8b3e4c36fde16a67a436ce37f00ad

 src/main/java/com/moral/mapper/DeviceVersionMapper.java

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

public interface DeviceVersionMapper extends BaseMapper<DeviceVersion> {
    public List<DeviceVersion> selectListByOrgId(Integer orgId);
    // 获取监控点下所有设备型号集合
    public List<DeviceVersion> selectListByMpointId(Integer orgId);
}