Merge remote-tracking branch 'origin/master'

fengxiang

2018-03-23 47ebcea682a84322b303ad1bc64eb7c30dbb5ff4

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

@@ -1,5 +1,7 @@
package com.moral.service;

import java.util.List;

import com.moral.common.bean.PageBean;
import com.moral.entity.Sensor;

@@ -14,4 +16,6 @@

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

    public List<Sensor> getAllSensors();
}