Merge remote-tracking branch 'origin/master'

fengxiang

2018-07-03 b97887d232f865b6a4bf835861aac8a4ebc55c28

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