Merge branch 'api' into order_reform

Helius

2021-01-05 6705385361aea5819cadd3efae0735521d22da7b

 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