Merge remote-tracking branch 'origin/main'

zhyc-admin/src/main/resources/application.yml

@@ -113,6 +113,7 @@ mybatis:
 # PageHelper分页插件
 pagehelper:
   helperDialect: mysql
+  reasonable: false
   supportMethodsArguments: true
   params: count=countSql
 

zhyc-common/src/main/java/com/zhyc/common/core/page/PageDomain.java

@@ -89,7 +89,7 @@ public class PageDomain
     {
         if (StringUtils.isNull(reasonable))
         {
-            return Boolean.TRUE;
+            return Boolean.FALSE;
         }
         return reasonable;
     }

zhyc-framework/src/main/java/com/zhyc/framework/config/MyBatisConfig.java

@@ -1,11 +1,10 @@
 package com.zhyc.framework.config;
 
 import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.List;
+import java.util.*;
 import javax.sql.DataSource;
+
+import com.github.pagehelper.PageHelper;
 import org.apache.ibatis.io.VFS;
 import org.apache.ibatis.session.SqlSessionFactory;
 import org.mybatis.spring.SqlSessionFactoryBean;

zhyc-module/pom.xml

@@ -17,12 +17,12 @@
             <groupId>zhyc</groupId>
             <artifactId>zhyc-common</artifactId>
         </dependency>
-        <!-- MyBatis-Plus 核心，已含 @TableField -->
         <dependency>
             <groupId>com.baomidou</groupId>
             <artifactId>mybatis-plus-boot-starter</artifactId>
             <version>3.5.3.2</version>   <!-- 用你项目已有的版本 -->
         </dependency>
+
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>