Merge remote-tracking branch 'origin/master'

fengxiang

2018-08-17 2d0b1b3da347f201cfe608e426fb2b7fdb9629a7

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