From 8287f743a1ac2fd5330f6dd7ca08255df193ae03 Mon Sep 17 00:00:00 2001
From: jyy <jyy>
Date: Fri, 09 Jul 2021 20:50:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/score_shop' into score_shop

---
 zq-erp/src/main/java/com/matrix/system/app/action/ApiCommonAction.java |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/zq-erp/src/main/java/com/matrix/system/app/action/ApiCommonAction.java b/zq-erp/src/main/java/com/matrix/system/app/action/ApiCommonAction.java
index 29ddb90..22f092b 100644
--- a/zq-erp/src/main/java/com/matrix/system/app/action/ApiCommonAction.java
+++ b/zq-erp/src/main/java/com/matrix/system/app/action/ApiCommonAction.java
@@ -224,12 +224,12 @@
     public AjaxResult findApiUrl() {
         List<UrlDto> data = new ArrayList<>();
         UrlDto urlDto = new UrlDto();
-        urlDto.setUrl("http://myapp.jyymatrix.cc/");
+        urlDto.setUrl("http://myapp.jyymatrix.cc");
         urlDto.setName("正式环境");
         data.add(urlDto);
 
         urlDto = new UrlDto();
-        urlDto.setUrl("http://test.hive.jyymatrix.cc/");
+        urlDto.setUrl("http://test.hive.jyymatrix.cc");
         urlDto.setName("测试环境");
         data.add(urlDto);
         return AjaxResult.buildSuccessInstance(data);

--
Gitblit v1.9.1