From 274fceda8d8ae15eead0fc6490f4d1680d9ab3c5 Mon Sep 17 00:00:00 2001
From: jyy <jyy>
Date: Sat, 17 Jul 2021 16:45:27 +0800
Subject: [PATCH] Merge branch 'score_shop' into api_score_meger
---
zq-erp/src/main/java/com/matrix/system/app/action/ApiCommonAction.java | 10 ++++++++--
1 files changed, 8 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..6090035 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,14 +224,20 @@
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);
+
+ urlDto = new UrlDto();
+ urlDto.setUrl("http://hive.mydoline.com");
+ urlDto.setName("美度专线");
+ data.add(urlDto);
+
return AjaxResult.buildSuccessInstance(data);
}
--
Gitblit v1.9.1