diff --git a/das/src/main/java/com/das/modules/equipment/controller/SysIotModelController.java b/das/src/main/java/com/das/modules/equipment/controller/SysIotModelController.java
index ab1e7d6b..3120e0fc 100644
--- a/das/src/main/java/com/das/modules/equipment/controller/SysIotModelController.java
+++ b/das/src/main/java/com/das/modules/equipment/controller/SysIotModelController.java
@@ -93,7 +93,10 @@ public class SysIotModelController {
     /** 获取物模型属性列表 */
     @PostMapping("/attribute/list")
     public PageDataInfo<SysIotModelFieldVo> querySysIotModelField(@RequestBody SysIotModelFieldDto sysIotModelFieldDto) {
-
+        if (sysIotModelFieldDto.getPageNum() == null && sysIotModelFieldDto.getPageSize() == null){
+            List<SysIotModelFieldVo> sysIotModelFieldVos = sysIotModelService.queryAllModelField(sysIotModelFieldDto);
+            return new PageDataInfo<>(sysIotModelFieldVos,sysIotModelFieldVos.size());
+        }
         return sysIotModelService.querySysIotModelField(sysIotModelFieldDto);
     }
 
diff --git a/das/src/main/java/com/das/modules/equipment/mapper/SysIotModelFieldMapper.java b/das/src/main/java/com/das/modules/equipment/mapper/SysIotModelFieldMapper.java
index 4f68cadc..ba102696 100644
--- a/das/src/main/java/com/das/modules/equipment/mapper/SysIotModelFieldMapper.java
+++ b/das/src/main/java/com/das/modules/equipment/mapper/SysIotModelFieldMapper.java
@@ -18,6 +18,8 @@ public interface SysIotModelFieldMapper extends BaseMapperPlus<SysIotModelField,
 
     Long querySysIotModelFieldByModelId(Long id);
 
+    List<SysIotModelFieldVo> querySysIotModelFieldList(@Param("info") SysIotModelFieldDto sysIotModelFieldDto);
+
     SysIotModelFieldVo selectByAttributeCode(Long iotModelId, String code);
 
     List<String> queryAllFiledNames(@Param("deviceId") Long deviceId);
diff --git a/das/src/main/java/com/das/modules/equipment/service/SysIotModelService.java b/das/src/main/java/com/das/modules/equipment/service/SysIotModelService.java
index ba0bf875..480385c9 100644
--- a/das/src/main/java/com/das/modules/equipment/service/SysIotModelService.java
+++ b/das/src/main/java/com/das/modules/equipment/service/SysIotModelService.java
@@ -25,6 +25,8 @@ public interface SysIotModelService {
 
     PageDataInfo<SysIotModelFieldVo> querySysIotModelField(SysIotModelFieldDto sysIotModelFieldDto);
 
+    List<SysIotModelFieldVo> queryAllModelField(SysIotModelFieldDto sysIotModelFieldDto);
+
     SysIotModelFieldVo creatSysIotModelField(SysIotModelFieldDto sysIotModelFieldDto);
 
     SysIotModelFieldVo updateSysIotModelField(SysIotModelFieldDto sysIotModelFieldDto);
diff --git a/das/src/main/java/com/das/modules/equipment/service/impl/SysIotModelServiceImpl.java b/das/src/main/java/com/das/modules/equipment/service/impl/SysIotModelServiceImpl.java
index b0b65162..29ef4447 100644
--- a/das/src/main/java/com/das/modules/equipment/service/impl/SysIotModelServiceImpl.java
+++ b/das/src/main/java/com/das/modules/equipment/service/impl/SysIotModelServiceImpl.java
@@ -144,6 +144,11 @@ public class SysIotModelServiceImpl implements SysIotModelService {
         return PageDataInfo.build(iPage.getRecords(), iPage.getTotal());
     }
 
+    @Override
+    public List<SysIotModelFieldVo> queryAllModelField(SysIotModelFieldDto sysIotModelFieldDto) {
+        return sysIotModelFieldMapper.querySysIotModelFieldList(sysIotModelFieldDto);
+    }
+
     @Override
     public SysIotModelFieldVo creatSysIotModelField(SysIotModelFieldDto sysIotModelFieldDto) {
         SysIotModelField sysIotModelField = new SysIotModelField();