Merge remote-tracking branch 'origin/master'

fengxiang

2018-06-01 239a521e95f6d7fcf8cbf18b71c09140e5d0f55f

 src/main/java/com/moral/controller/SensorController.java

@@ -35,4 +35,11 @@
        ResultBean resultBean = new ResultBean(ResultBean.SUCCESS);
        return resultBean;
    }
    
    @GetMapping("all")
    public ResultBean<List<Sensor>> getAllSensors() {
       List<Sensor> sensors = sensorService.getAllSensors();
        return new ResultBean<List<Sensor>>(sensors);
    }

}