合并代码，解决冲突

iot-platform-common/src/main/java/com/platform/request/PageRequest.java

@@ -16,7 +16,7 @@ public class PageRequest implements Serializable {
     /**
      * 当前页码
      */
-    private int current = 1;
+    private int pageNum = 1;
 	/**
 	 * 每页数量
 	 */

iot-platform-manager/src/main/java/com/platform/manage/IotDeviceGroupManage.java

@@ -59,7 +59,7 @@ public class IotDeviceGroupManage {
     public DeviceGroupPageResp pageGroupDevice(DeviceGroupDetailReq req) {
         //todo 设置参数
         IotDeviceGroup iotDeviceGroup = new IotDeviceGroup();
-        Page page = iotDeviceGroupService.pageGroupDevice(req.getCurrent(),req.getPageSize(),iotDeviceGroup);
+        Page page = iotDeviceGroupService.pageGroupDevice(req.getPageNum(),req.getPageSize(),iotDeviceGroup);
         return null;
     }
 }

iot-platform-manager/src/main/java/com/platform/manage/IotModManage.java

@@ -50,21 +50,21 @@ public class IotModManage {
      * @return
      */
     public PageResult<IotModPageResp> pageModList(IotModRequest request) {
-        IPage<IotMod> page = new Page<>(request.getPage(), request.getPageSize());
+        IPage<IotMod> page = new Page<>(request.getPageNum(), request.getPageSize());
         LambdaQueryWrapper<IotMod> queryWrapper =  Wrappers.<IotMod>lambdaQuery()
                 .eq(IotMod::getModeGroupCode, request.getModeGroupCode())
                 .eq(StringUtils.isNotBlank(request.getGuid()), IotMod::getGuid,request.getGuid())
                 .eq(StringUtils.isNotBlank(request.getName()), IotMod::getName,request.getName());
         List<IotMod> modList = iotModService.list(page, queryWrapper);
         if (CollectionUtils.isEmpty(modList)) {
-            PageResult.empty(request.getPage(),request.getPageSize());
+            PageResult.empty(request.getPageNum(),request.getPageSize());
         }
         List<IotModPageResp> modPageRespList = new ArrayList<>();
         for (IotMod item : modList) {
             IotModPageResp iotPageResp = IotModPageResp.toIotPageResp(item);
             modPageRespList.add(iotPageResp);
         }
-        return PageResult.of(modPageRespList.size(), request.getPage(), request.getPageSize(), modPageRespList);
+        return PageResult.of(modPageRespList.size(), request.getPageNum(), request.getPageSize(), modPageRespList);
 
     }
 

iot-platform-manager/src/main/java/com/platform/request/mod/IotModRequest.java

@@ -13,7 +13,17 @@ import lombok.Data;
 
 @Data
 public class IotModRequest extends PageRequest {
-    
+
+    /**
+     * 物理模型码值
+     */
+    private String modCode;
+
+    /**
+     * 所属客户id
+     */
+    private Long companyId;
+
     /**
      * 物模型分组码值
      */
@@ -29,7 +39,30 @@ public class IotModRequest extends PageRequest {
      */
     private String name;
 
+    /**
+     * 备注
+     */
+    private String remarks;
+
+    /**
+     * 包含JSON
+     */
+    private String tslJson;
+
+    /**
+     * 设备数
+     */
+    private Integer num;
 
+    /**
+     * 创建人
+     */
+    private String createUser;
+
+    /**
+     * 更新人
+     */
+    private String updateUser;