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

xiaoyong931011

2021-03-11 7387cb3e2f9e8b588c7be30b129faeee4050034d

 zq-erp/src/main/resources/config/system.properties

@@ -17,7 +17,8 @@

#文件保存地址
#file_storage_path=/mnt/hive/static/uploadeFile/
file_storage_path=/Users/jiangyouyao/java/webresources/
file_storage_path=D:\\test\\

#文件上传大小字节为单位  10MB
maxUploadSize=10485760