Merge branch 'hcp' into test

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

@@ -87,6 +87,7 @@ public class MercMiniDeviceController {
     @PostMapping("pageByAdminName")
     public R<PageBean<DeviceInfoDto.ListByAdminName>> pageByAdminName(@RequestBody @Validated DeviceInfoDto.PageByAdminNameDto dto) {
         dto.setMercId(MercAuthUtils.getMercId());
+        dto.setDeviceIdList(getMyDevices());
         dto.setPage(dto.getPage().setOrders(null));
         return deviceInfoService.pageByAdminName(dto);
     }

device-api-service/src/main/resources/mapper/DeviceInfoMapper.xml

@@ -114,7 +114,7 @@
     </select>
 
     <select id="pageByAdminName" resultType="com.xy.dto.DeviceInfoDto$ListByAdminName">
-        SELECT d.device_id, d.device_name, p.admin_name, d.device_type,p.region_name,p.place_name,m.name as merc_name
+        SELECT d.device_id, d.device_name, p.admin_name, d.device_type,p.region_name,p.place_name,m.name as merc_name,m.merc_code as merc_code
         FROM device_info d
         left join merc_place p on p.id = d.place_id
         left join merc m on m.id = d.merc_id

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

@@ -112,6 +112,9 @@ public final static String DEL = "del";
 
         @ApiModelProperty("商户名称")
         private String mercName;
+
+        @ApiModelProperty("商户编号")
+        private String mercCode;
     }
 
     @Data