Merge branch 'api' into order_reform

Helius

2021-01-08 1cfbbe629377a6147d3415d38be3c0401e586669

 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