Merge remote-tracking branch 'origin/master'

fengxiang

2018-02-02 57cb796b40a983afcff66edf967e2a1eb513b870

 src/main/java/com/moral/service/impl/SensorServiceImpl.java

@@ -61,4 +61,9 @@

        }
    }

    @Override
   public List<Sensor> getAllSensors() {
      return sensorMapper.selectAll();
   }
}