From cd0252da419d4065e322b945da2d836796bc0e1f Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期一, 29 四月 2024 11:23:46 +0800
Subject: [PATCH] 合并冲突

---
 src/assets/api/controller.js |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/src/assets/api/controller.js b/src/assets/api/controller.js
index add2ebd..3c5b676 100644
--- a/src/assets/api/controller.js
+++ b/src/assets/api/controller.js
@@ -178,6 +178,7 @@
 	selectStandardProductList: "/standardTree/selectStandardProductList", //閫氳繃鏍囧噯鏍戞煡璇㈠搴旂殑妫�楠岄」鐩�
 	selectStandardProductListByMethodId: "/standardTree/selectStandardProductListByMethodId", //閫氳繃妫�楠屾爣鍑嗘煡璇㈡楠岄」鐩�
 	selectStandardMethodEnum: "/standardTree/selectStandardMethodEnum", //鑾峰彇鏍囧噯鏍戜笅鏍囧噯鏂规硶鏋氫妇
+  getStandardTree2: "/standardTree/getStandardTree2", //鑾峰彇浜у搧鏋舵瀯
 }
 
 const standardMethod = {

--
Gitblit v1.9.3