Merge branch 'dyf-device'

# Conflicts:
#	fys-admin/src/main/java/com/fuyuanshen/app/service/AppDeviceBizService.java
#	fys-admin/src/main/java/com/fuyuanshen/global/mqtt/rule/LocationDataRule.java

fys-admin/src/main/java/com/fuyuanshen/app/controller/AppDeviceController.java

@@ -44,7 +44,6 @@ public class AppDeviceController extends BaseController {
      */
     @GetMapping("/list")
     public TableDataInfo<AppDeviceVo> list(DeviceQueryCriteria bo, PageQuery pageQuery) {
-
         return appDeviceService.queryAppDeviceList(bo,pageQuery);
     }