Merge remote-tracking branch 'origin/master'

fengxiang

2018-07-12 6d1509ab9e5aa911a6a2cdc2ab5a0887210f0b41

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

@@ -14,8 +14,14 @@

    PageBean queryByVersionId(Integer deviceVersionId);

    List<Sensor> queryListByVersionId(Integer deviceVersionId);

    List<Sensor> queryListByVersionNo(Integer versionNo);

    public void addOrModify(Sensor sensor);
    public void deleteByIds(Integer... ids);

    List<Sensor> queryByOrgId(Integer organizationId);

    public List<Sensor> getAllSensors();
}