Merge remote-tracking branch 'origin/master'

沈斌

2018-02-02 f2b0c39642daf84c37b728d8d5553e866908faf1

 src/main/java/com/moral/mapper/SensorMapper.java

@@ -3,5 +3,11 @@
import com.moral.common.mapper.BaseMapper;
import com.moral.entity.Sensor;

import java.util.List;
import java.util.Map;

public interface SensorMapper extends BaseMapper<Sensor> {
    List<Sensor> selectByVersionId(Integer deviceVersionId);

   List<Map<String, Object>> getSensorsByDeviceVersionId(Integer deviceVersionId);
}