diff --git a/base-manager/src/main/java/com/mortals/xhx/module/app/model/vo/AppInfoFieldVo.java b/base-manager/src/main/java/com/mortals/xhx/module/app/model/vo/AppInfoFieldVo.java
index 739c521e0ddf2349493790ce65b77949ad4704b5..bae5a64a2c9de56cab012645c812a3f11901d4e9 100644
--- a/base-manager/src/main/java/com/mortals/xhx/module/app/model/vo/AppInfoFieldVo.java
+++ b/base-manager/src/main/java/com/mortals/xhx/module/app/model/vo/AppInfoFieldVo.java
@@ -3,6 +3,7 @@ package com.mortals.xhx.module.app.model.vo;
 import com.mortals.framework.model.BaseEntityLong;
 import com.mortals.xhx.module.app.model.AppDatasetQuery;
 import com.mortals.xhx.module.app.model.AppInfoFieldEntity;
+import com.mortals.xhx.module.app.model.AppInfoFieldQuery;
 import lombok.Data;
 
 import java.util.ArrayList;
@@ -18,14 +19,11 @@ import java.util.List;
 public class AppInfoFieldVo extends BaseEntityLong {
 
 
-    /**
-     * OR鏉′欢闆嗗悎锛屽垪琛ㄩ」涔嬮棿鏄疧R锛岄」鍐呭涔嬮棿鏄疉ND锛屽锛�(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
-     */
-    private List<AppDatasetQuery> orConditionList;
+    /** OR鏉′欢闆嗗悎锛屽垪琛ㄩ」涔嬮棿鏄疧R锛岄」鍐呭涔嬮棿鏄疉ND锛屽锛�(list[0].1 and list[0].2) or (list[1].3 and list[1].4) */
+    private List<AppInfoFieldQuery> orConditionList;
+
+    /** AND鏉′欢闆嗗悎锛屽垪琛ㄩ」涔嬮棿鏄疉ND锛岄」鍐呭涔嬮棿鏄疧R锛屽锛�(list[0].1 or list[0].2) and (list[1].3 or list[1].4) */
+    private List<AppInfoFieldQuery> andConditionList;
 
-    /**
-     * AND鏉′欢闆嗗悎锛屽垪琛ㄩ」涔嬮棿鏄疉ND锛岄」鍐呭涔嬮棿鏄疧R锛屽锛�(list[0].1 or list[0].2) and (list[1].3 or list[1].4)
-     */
-    private List<AppDatasetQuery> andConditionList;
 
 }
\ No newline at end of file
diff --git a/base-manager/src/main/java/com/mortals/xhx/module/app/model/vo/AppInfoTempleteFieldVo.java b/base-manager/src/main/java/com/mortals/xhx/module/app/model/vo/AppInfoTempleteFieldVo.java
index 12b8d88e791eba2e7b3110c05db1bf1e2a98e142..51164f08842b587dc9df06671d41a014c7c853c7 100644
--- a/base-manager/src/main/java/com/mortals/xhx/module/app/model/vo/AppInfoTempleteFieldVo.java
+++ b/base-manager/src/main/java/com/mortals/xhx/module/app/model/vo/AppInfoTempleteFieldVo.java
@@ -2,6 +2,7 @@ package com.mortals.xhx.module.app.model.vo;
 import com.mortals.framework.model.BaseEntityLong;
 import com.mortals.xhx.module.app.model.AppDatasetQuery;
 import com.mortals.xhx.module.app.model.AppInfoTempleteFieldEntity;
+import com.mortals.xhx.module.app.model.AppInfoTempleteFieldQuery;
 import lombok.Data;
 
 import java.util.ArrayList;
@@ -15,11 +16,9 @@ import java.util.List;
 @Data
 public class AppInfoTempleteFieldVo extends BaseEntityLong {
 
-
-
     /** OR鏉′欢闆嗗悎锛屽垪琛ㄩ」涔嬮棿鏄疧R锛岄」鍐呭涔嬮棿鏄疉ND锛屽锛�(list[0].1 and list[0].2) or (list[1].3 and list[1].4) */
-    private List<AppDatasetQuery> orConditionList;
+    private List<AppInfoTempleteFieldQuery> orConditionList;
 
     /** AND鏉′欢闆嗗悎锛屽垪琛ㄩ」涔嬮棿鏄疉ND锛岄」鍐呭涔嬮棿鏄疧R锛屽锛�(list[0].1 or list[0].2) and (list[1].3 or list[1].4) */
-    private List<AppDatasetQuery> andConditionList;
+    private List<AppInfoTempleteFieldQuery> andConditionList;
 }
\ No newline at end of file