From e4be5ba9eea9fe8408f3a7048a315b3767b33f49 Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期五, 23 二月 2024 09:54:38 +0800
Subject: [PATCH] mrshi
---
platform/src/api/business/company.js | 5 -----
1 files changed, 0 insertions(+), 5 deletions(-)
diff --git a/platform/src/api/business/company.js b/platform/src/api/business/company.js
index 56d556d..27d8e6f 100644
--- a/platform/src/api/business/company.js
+++ b/platform/src/api/business/company.js
@@ -17,17 +17,12 @@
return request.post('/business/company/updateById', data)
}
-<<<<<<< HEAD
-// 鏌ヨ鍏ㄩ儴鏁版嵁(璐﹀彿鍒嗛厤浼佷笟浣跨敤)
-export function pageAll (data) {
-=======
export function pageAll (data) {
return request.post('/business/company/list', data)
}
// 鏌ヨ鍏ㄩ儴鏁版嵁(璐﹀彿鍒嗛厤浼佷笟浣跨敤)
export function allForFp (data) {
->>>>>>> c421d2deeec5530d8060d8e06b5b86bb02e72dbf
return request.post('/business/company/pageAll', data)
}
--
Gitblit v1.9.3