Merge branch 'ty_fix' into alpha

wzy

2021-11-11 a8e49145532aac83a85b05492c118a554f72c466

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

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