Merge remote-tracking branch 'origin/master'

于紫祥_1901

2020-10-22 f0b5148973e9437f3651153e53f8f336c4c3c6ff

 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);
}