Merge remote-tracking branch 'origin/master'

fengxiang

2018-03-26 53d155ae4b7c4d5d7258c3d15cfff78ec41561f7

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

@@ -27,7 +27,7 @@
    public List<Sensor> queryAll(){
        return sensorMapper.selectByExample(null);
    }
    public PageBean queryByPageBean(PageBean pageBean){
    public PageBean<Sensor> queryByPageBean(PageBean pageBean){
        return MyBatisBaseMapUtil.queryPage(sensorMapper,pageBean,ENTITY_CLASS);
    }
    @Override