Merge remote-tracking branch 'origin/hive2.0' into hive2.0

935090232@qq.com

2021-02-05 1e1282e8ed0385a1bc88d82dbd9bbcf5d1d22ece

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

@@ -12,9 +12,9 @@
default_password=123

#nginx静态资源访问地址
static_resource_url=https://filehive2.jyymatrix.cc/uploadeFile/
static_resource_url=http://testfile.hive.jyymatrix.cc/
#文件保存地址
file_storage_path=/mnt/hive/static/uploadeFile/
file_storage_path=/mnt/upload/
#文件上传大小字节为单位  10MB
maxUploadSize=10485760