Merge remote-tracking branch 'origin/master'

fengxiang

2018-07-04 28b17e7a9b0bd3a8ed545aff4f077fe981db85d2

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

@@ -17,4 +17,6 @@
    void  deleteRtdLayout(Integer orgId, Integer version);

    RealTimeDeviceLayout queryRtdLayoutWithUnit(Integer orgId, Integer versionNo);

    RealTimeDeviceLayout queryRtdLayoutWithUnit(Integer orgId, List<Integer> versionNos);
}