Merge branch 'ty_urgent' into test

wzy

2020-12-26 b026000678b45d14970bca3b8052e377072f4af2

 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