Merge remote-tracking branch 'origin/master'

device-api-service/src/main/java/com/xy/service/DeviceInfoServiceImpl.java

@@ -352,8 +352,8 @@ public class DeviceInfoServiceImpl extends ServiceImpl<DeviceInfoMapper, DeviceI
         return R.ok();
     }
 
-    @PostMapping("page")
     @ApiOperation("分页查询")
+    @Override
     public R<PageBean<DeviceInfoDto.Vo2>> page(@RequestBody DeviceInfoDto.Page page) {
         return R.ok(queryPage(page));
     }

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

@@ -23,6 +23,9 @@
         <result column="update_time" property="updateTime"/>
         <result column="merc_name" property="mercName"/>
         <result column="create_time" property="createTime"/>
+        <result column="place_name" property="placeName"/>
+        <result column="place_line_name" property="placeLineName"/>
+        <result column="district_name" property="districtName"/>
 
         <association property="deviceSysinfo" javaType="com.xy.dto.DeviceSysinfoDto$Vo">
             <result column="sysinfo_device_sn" property="deviceSn"/>

device-api/src/main/java/com/xy/service/DeviceInfoService.java

@@ -96,6 +96,8 @@ public interface DeviceInfoService {
     @PostMapping("pageSingle")
     R<PageBean<DeviceInfoDto.Vo>> pageSingle(@RequestBody DeviceInfoDto.PageSingle dto);
 
+    @PostMapping("page")
+    R<PageBean<DeviceInfoDto.Vo2>> page(@RequestBody DeviceInfoDto.Page page);
     /**
      * 更新商户点位
      *