Merge branch 'ty_fix' into alpha

Helius

2021-11-08 64944a0dfd639a5c335d22f8230a64bf875f284f

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

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