Merge branch 'master' into test

935090232@qq.com

2020-12-04 a16643ca6a2e2a680fc827979368ad283e146815

 zq-erp/src/main/resources/config/test/application.properties

@@ -10,6 +10,7 @@




spring.datasource.type=com.alibaba.druid.pool.DruidDataSource
spring.datasource.initialSize=3
spring.datasource.minIdle=3