From 870960399814cff73d1e6ef93fccb11bede8d464 Mon Sep 17 00:00:00 2001
From: jyy <jyy>
Date: Sat, 10 Jul 2021 09:04:39 +0800
Subject: [PATCH] Merge branch 'score_shop' into api_score_meger
---
zq-erp/src/main/java/com/matrix/system/app/action/ApiCommonAction.java | 8 +++++++-
1 files changed, 7 insertions(+), 1 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 d2730e9..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
@@ -219,7 +219,6 @@
}
-
@ApiOperation(value = "获取api接口地址", notes = "获取api接口地址")
@GetMapping(value = "/findApiUrl")
public AjaxResult findApiUrl() {
@@ -233,9 +232,16 @@
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