Merge remote-tracking branch 'origin/api_score_meger' into api_score_meger

jyy

2021-07-10 1ee0a09016bd72b508456b23dae1afab44cd856b

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

@@ -1,4 +1,4 @@
evn=test
evn=xcshop
server.port=8080