diff --git a/jero-boot/jero-boot-module-system/src/main/resources/jero/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javai b/jero-boot/jero-boot-module-system/src/main/resources/jero/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javai
index a71d5b6a..e86b0b45 100644
--- a/jero-boot/jero-boot-module-system/src/main/resources/jero/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javai
+++ b/jero-boot/jero-boot-module-system/src/main/resources/jero/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javai
@@ -75,8 +75,7 @@ public class ${entityName}Controller extends JeroController<${entityName}, I${en
     @ApiOperation(value="${tableVo.ftlDescription}-列表查询", notes="${tableVo.ftlDescription}-列表查询")
 	@GetMapping(value = "/list")
 	public Result<List<${entityName}>> queryList(${entityName} ${entityName?uncap_first}, HttpServletRequest req) {
-	    QueryWrapper<${entityName}> queryWrapper = QueryGenerator.initQueryWrapper(${entityName?uncap_first}, req.getParameterMap());
-        List<${entityName}> list = ${entityName?uncap_first}Service.queryList(queryWrapper);
+        List<${entityName}> list = ${entityName?uncap_first}Service.queryList(${entityName?uncap_first}, req);
         return Result.OK(list);
 	}
 
diff --git a/jero-boot/jero-boot-module-system/src/main/resources/jero/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/service/I${entityName}Service.javai b/jero-boot/jero-boot-module-system/src/main/resources/jero/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/service/I${entityName}Service.javai
index 0070b225..8ce85431 100644
--- a/jero-boot/jero-boot-module-system/src/main/resources/jero/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/service/I${entityName}Service.javai
+++ b/jero-boot/jero-boot-module-system/src/main/resources/jero/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/service/I${entityName}Service.javai
@@ -1,8 +1,8 @@
 package ${bussiPackage}.${entityPackage}.service;
 
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import ${bussiPackage}.${entityPackage}.entity.${entityName};
 import com.baomidou.mybatisplus.extension.service.IService;
+import javax.servlet.http.HttpServletRequest;
 import java.util.List;
 
 /**
@@ -56,8 +56,9 @@ public interface I${entityName}Service extends IService<${entityName}> {
     /**
 	 * 列表查询
 	 *
-	 * @param queryWrapper
+	 * @param ${entityName?uncap_first}
+	 * @param req
 	 * @return
 	 */
-    List<${entityName}> queryList(QueryWrapper<${entityName}> queryWrapper);
+    List<${entityName}> queryList(${entityName} ${entityName?uncap_first}, HttpServletRequest req);
 }
diff --git a/jero-boot/jero-boot-module-system/src/main/resources/jero/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/service/impl/${entityName}ServiceImpl.javai b/jero-boot/jero-boot-module-system/src/main/resources/jero/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/service/impl/${entityName}ServiceImpl.javai
index 0bae848c..55bd2fc1 100644
--- a/jero-boot/jero-boot-module-system/src/main/resources/jero/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/service/impl/${entityName}ServiceImpl.javai
+++ b/jero-boot/jero-boot-module-system/src/main/resources/jero/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/service/impl/${entityName}ServiceImpl.javai
@@ -9,7 +9,9 @@ import com.jero.common.exception.JeroBootException;
 import java.util.List;
 import java.util.Date;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.jero.common.system.query.QueryGenerator;
+import javax.servlet.http.HttpServletRequest;
+
 
 /**
  * @Description: ${tableVo.ftlDescription}
@@ -84,11 +86,12 @@ public class ${entityName}ServiceImpl extends ServiceImpl<${entityName}Mapper, $
     /**
 	 * 列表查询
 	 *
-	 * @param queryWrapper
+	 * @param ${entityName?uncap_first}
+	 * @param req
 	 * @return
 	 */
 	@Override
-    public List<${entityName}> queryList(QueryWrapper<${entityName}> queryWrapper) {
-        return list(queryWrapper);
+    public List<${entityName}> queryList(${entityName} ${entityName?uncap_first}, HttpServletRequest req) {
+        return list(QueryGenerator.initQueryWrapper(${entityName?uncap_first}, req.getParameterMap()));
     }
 }
diff --git a/jero-boot/jero-boot-module-system/src/main/resources/jero/code-template/one/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javai b/jero-boot/jero-boot-module-system/src/main/resources/jero/code-template/one/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javai
index 62f91a9c..afec81cb 100644
--- a/jero-boot/jero-boot-module-system/src/main/resources/jero/code-template/one/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javai
+++ b/jero-boot/jero-boot-module-system/src/main/resources/jero/code-template/one/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javai
@@ -74,14 +74,15 @@ public class ${entityName}Controller extends JeroController<${entityName}, I${en
     /**
 	 * 列表查询
 	 *
+	 * @param ${entityName?uncap_first}
+     * @param req
 	 * @return
 	 */
 	@AutoLog(value = "${tableVo.ftlDescription}-列表查询")
     @ApiOperation(value="${tableVo.ftlDescription}-列表查询", notes="${tableVo.ftlDescription}-列表查询")
 	@GetMapping(value = "/list")
 	public Result<List<${entityName}>> queryList(${entityName} ${entityName?uncap_first}, HttpServletRequest req) {
-	    QueryWrapper<${entityName}> queryWrapper = QueryGenerator.initQueryWrapper(${entityName?uncap_first}, req.getParameterMap());
-        List<?> list = ${entityName?uncap_first}Service.queryList(queryWrapper);
+        List<?> list = ${entityName?uncap_first}Service.queryList(${entityName?uncap_first},req);
         return Result.OK(list);
 	}
 
diff --git a/jero-boot/jero-boot-module-system/src/main/resources/jero/code-template/one/java/${bussiPackage}/${entityPackage}/service/I${entityName}Service.javai b/jero-boot/jero-boot-module-system/src/main/resources/jero/code-template/one/java/${bussiPackage}/${entityPackage}/service/I${entityName}Service.javai
index 16b00f4f..a65a1407 100644
--- a/jero-boot/jero-boot-module-system/src/main/resources/jero/code-template/one/java/${bussiPackage}/${entityPackage}/service/I${entityName}Service.javai
+++ b/jero-boot/jero-boot-module-system/src/main/resources/jero/code-template/one/java/${bussiPackage}/${entityPackage}/service/I${entityName}Service.javai
@@ -2,6 +2,7 @@ package ${bussiPackage}.${entityPackage}.service;
 
 import ${bussiPackage}.${entityPackage}.entity.${entityName};
 import com.baomidou.mybatisplus.extension.service.IService;
+import javax.servlet.http.HttpServletRequest;
 import java.util.List;
 
 /**
@@ -52,10 +53,11 @@ public interface I${entityName}Service extends IService<${entityName}> {
     ${entityName} queryById(String id);
 
     /**
-	 * 列表查询
-	 *
-	 * @param queryWrapper
-	 * @return
-	 */
-    List<${entityName}> queryList(QueryWrapper<${entityName}> queryWrapper);
+     * 列表查询
+     *
+     * @param ${entityName?uncap_first}
+     * @param req
+     * @return
+     */
+    List<${entityName}> queryList(${entityName} ${entityName?uncap_first}, HttpServletRequest req);
 }
diff --git a/jero-boot/jero-boot-module-system/src/main/resources/jero/code-template/one/java/${bussiPackage}/${entityPackage}/service/impl/${entityName}ServiceImpl.javai b/jero-boot/jero-boot-module-system/src/main/resources/jero/code-template/one/java/${bussiPackage}/${entityPackage}/service/impl/${entityName}ServiceImpl.javai
index e5468e06..160232dc 100644
--- a/jero-boot/jero-boot-module-system/src/main/resources/jero/code-template/one/java/${bussiPackage}/${entityPackage}/service/impl/${entityName}ServiceImpl.javai
+++ b/jero-boot/jero-boot-module-system/src/main/resources/jero/code-template/one/java/${bussiPackage}/${entityPackage}/service/impl/${entityName}ServiceImpl.javai
@@ -8,6 +8,8 @@ import org.springframework.transaction.annotation.Transactional;
 import com.jero.common.exception.JeroBootException;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.jero.common.system.query.QueryGenerator;
+import javax.servlet.http.HttpServletRequest;
 
 /**
  * @Description: ${tableVo.ftlDescription}
@@ -74,13 +76,14 @@ public class ${entityName}ServiceImpl extends ServiceImpl<${entityName}Mapper, $
     }
 
     /**
-	 * 列表查询
-	 *
-	 * @param queryWrapper
-	 * @return
-	 */
-	@Override
-    List<${entityName}> queryList(QueryWrapper<${entityName}> queryWrapper) {
-        return list(queryWrapper);
+     * 列表查询
+     *
+     * @param ${entityName?uncap_first}
+     * @param req
+     * @return
+     */
+    @Override
+    public List<${entityName}> queryList(${entityName} ${entityName?uncap_first}, HttpServletRequest req) {
+        return list(QueryGenerator.initQueryWrapper(${entityName?uncap_first}, req.getParameterMap()));
     }
 }