From c9f07c1f79e7ea9eb00925975d3ae2c9e8dcbd25 Mon Sep 17 00:00:00 2001
From: nidapeng <jp@doumee.com>
Date: 星期三, 20 三月 2024 11:37:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/1.0.1' into 1.0.1
---
platform/src/api/business/solutions.js | 3 ---
1 files changed, 0 insertions(+), 3 deletions(-)
diff --git a/platform/src/api/business/solutions.js b/platform/src/api/business/solutions.js
index 622b548..4d890c1 100644
--- a/platform/src/api/business/solutions.js
+++ b/platform/src/api/business/solutions.js
@@ -36,11 +36,8 @@
export function listForCompany (data) {
return request.post('/business/companySolution/listForCompany', data)
}
-<<<<<<< HEAD
// 鏍规嵁鍘嗗彶鐗堟湰鏌ヨ褰撳墠鏈�鏂板惎鐢ㄧ増鏈�
export function getNewVersion (id) {
return request.get(`/business/solutions/getNewVersion?solutionId=${id}`)
}
-=======
->>>>>>> c421d2deeec5530d8060d8e06b5b86bb02e72dbf
--
Gitblit v1.9.3