Merge branch 'hcp' into test

device-api-service-merc-mini/src/main/java/com/xy/controller/MercMiniDeviceController.java

@@ -100,14 +100,9 @@ public class MercMiniDeviceController {
 
     @PostMapping("searchPage")
     @ApiOperation("小程序商户设备搜索")
-    public R<PageBean<DeviceInfoDto.MerHomeSearchVO>> mercDeviceSearchPage(@RequestBody MercMiniDeviceDto.Page page) {
-        //如果传入子商户ID，则只查子商户的设备
-        if(Emptys.check(page.getSubMercId())){
-            page.setMercId(page.getSubMercId());
-        }else{
-            page.setMercId(page.getMercId());
-            page.setMyDeviceIds(getMyDevices());
-        }
+    public R<PageBean<DeviceInfoDto.MerHomeSearchVO>> mercDeviceSearchPage(@RequestBody DeviceInfoDto.Page page) {
+        page.setMercId(MercAuthUtils.getMercId());
+        page.setMyDeviceIds(getMyDevices());
         return deviceInfoService.mercDeviceSearchPage(page);
     }
 

device-api/src/main/java/com/xy/dto/MercMiniDeviceDto.java

@@ -12,11 +12,6 @@ import javax.validation.constraints.NotNull;
 
 public class MercMiniDeviceDto {
 
-    @Data
-    @Accessors(chain = true)
-    public static class Page extends DeviceInfoDto.Page {
-        private Long subMercId;
-    }
     @Data
     @Accessors(chain = true)
     public static class ListOfIdNameVo {