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

JinPengYong

2020-04-26 3df4f24049c8b3e4c36fde16a67a436ce37f00ad

 src/main/java/com/moral/service/DeviceVersionService.java

@@ -14,6 +14,10 @@

    void versionSensorConfig(Integer deviceVersionId, Integer[] sensorIds);

    Integer queryMaxVersionNo();

    DeviceVersion queryByVersionNo(int versionNo);

    List<Integer> getSensorIds(int deviceVersionId);

    List<DeviceVersion> queryByOrgId(Integer organizationId);