From ac61bdd7a7f4834d35bf42a06bc766981f50211e Mon Sep 17 00:00:00 2001
From: 935090232@qq.com <ak473600000>
Date: Fri, 29 Jan 2021 20:27:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/hive2.0' into hive2.0

---
 zq-erp/src/main/resources/config/test/system.properties |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/zq-erp/src/main/resources/config/test/system.properties b/zq-erp/src/main/resources/config/test/system.properties
index a7923b6..c3e4615 100644
--- a/zq-erp/src/main/resources/config/test/system.properties
+++ b/zq-erp/src/main/resources/config/test/system.properties
@@ -12,7 +12,7 @@
 default_password=123
 
 #nginx静态资源访问地址
-static_resource_url=https://testfile.hive.jyymatrix.cc/
+static_resource_url=resource.hive.jyymatrix.cc
 #文件保存地址
 file_storage_path=/mnt/upload/
 #文件上传大小字节为单位  10MB

--
Gitblit v1.9.1