Merge branch 'dev' of https://e.coding.net/g-cphe0354/shouyinjixitong/wx-cashier-service into dev

src/main/resources/application-dev.yml

@@ -40,12 +40,6 @@ spring:
     port: 5672
     username: admin
     password: Czg666888
-#分页配置
-pagehelper:
-  supportMethodsArguments: true
-  reasonable: true
-  helperDialect: mysql
-  params: count=countSql
 
 mybatis:
   configuration:

src/main/resources/application-dev2.yml

@@ -37,12 +37,7 @@ spring:
     port: 5672
     username: admin
     password: Czg666888
-#分页配置
-pagehelper:
-  supportMethodsArguments: true
-  reasonable: true
-  helperDialect: mysql
-  params: count=countSql
+
 
 mybatis:
   configuration:

src/main/resources/application-hph.yml

@@ -39,12 +39,6 @@ spring:
     port: 5672
     username: admin
     password: Czg666888
-#分页配置
-pagehelper:
-  supportMethodsArguments: true
-  reasonable: true
-  helperDialect: mysql
-  params: count=countSql
 
 mybatis:
   configuration:

src/main/resources/application-prod.yml

@@ -39,12 +39,6 @@ spring:
     port: 5672
     username: admin
     password: Czg666888
-#分页配置
-pagehelper:
-  supportMethodsArguments: true
-  reasonable: true
-  helperDialect: mysql
-  params: count=countSql
 
 mybatis:
   configuration:

src/main/resources/application-prod2.yml

@@ -39,12 +39,6 @@ spring:
     port: 5672
     username: admin
     password: Czg666888
-#分页配置
-pagehelper:
-  supportMethodsArguments: true
-  reasonable: true
-  helperDialect: mysql
-  params: count=countSql
 
 mybatis:
   configuration:

src/main/resources/application-test.yml

@@ -37,12 +37,6 @@ spring:
     port: 5672
     username: admin
     password: Czg666888
-#分页配置
-pagehelper:
-  supportMethodsArguments: true
-  reasonable: true
-  helperDialect: mysql
-  params: count=countSql
 
 mybatis:
   configuration:

src/main/resources/application.yml

@@ -34,7 +34,12 @@ netty:
     parent-group-threads: 10
     # 客户端的线程数
     child-group-threads: 10
-
+#分页配置
+pagehelper:
+  supportMethodsArguments: true
+  reasonable: false
+  helperDialect: mysql
+  params: count=countSql
 logging:
   level:
     # web日志