From a13255b4129ee8a7a7b7e1ecd8e02dd2c78f7c17 Mon Sep 17 00:00:00 2001
From: 田源 <tianyuan@vci-tech.com>
Date: 星期四, 16 一月 2025 16:19:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/OsAttributeController.java | 12 ++++--------
1 files changed, 4 insertions(+), 8 deletions(-)
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/OsAttributeController.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/OsAttributeController.java
index 2323993..8f20767 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/OsAttributeController.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/OsAttributeController.java
@@ -2,7 +2,6 @@
import com.vci.constant.FrameWorkLangCodeConstant;
import com.vci.dto.OsAttributeDTO;
-import com.vci.starter.web.annotation.controller.VciUnCheckRight;
import com.vci.starter.web.annotation.log.VciBusinessLog;
import com.vci.starter.web.exception.VciBaseException;
import com.vci.starter.web.pagemodel.BaseQueryObject;
@@ -14,7 +13,7 @@
import com.vci.starter.web.util.LocalFileUtil;
import com.vci.starter.web.util.VciBaseUtil;
import com.vci.web.service.OsAttributeServiceI;
-import com.vci.web.util.Func;
+import com.vci.starter.web.util.Lcm.Func;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -48,17 +47,15 @@
*/
private Logger logger = LoggerFactory.getLogger(getClass());
-
-
/**
- * 鑾峰彇鎵�鏈変笟鍔＄被鍨嬶紙鏍戝舰缁撴瀯锛�
+ * 鑾峰彇鎵�鏈夊睘鎬э紙鏍戝舰缁撴瀯锛�
* @return 鏌ヨ缁撴灉
*/
@GetMapping( "/getTreeAttributes")
@VciBusinessLog(operateName = "鑾峰彇灞炴�э紙鏍戝舰缁撴瀯锛�")
public BaseResult<List<Tree>> getTreeAttributesByBtmName(TreeQueryObject treeQueryObject){
try {
- List<Tree> trees= attributeService.getTreeAttributesByBtmName(treeQueryObject);
+ List<Tree> trees = attributeService.getTreeAttributesByBtmName(treeQueryObject);
return BaseResult.dataList(trees);
// return BaseResult.tree(trees);
}catch (Throwable e) {
@@ -68,7 +65,6 @@
return BaseResult.fail(exceptionMessage);
}
}
-
/**
* 灞炴�у垪琛�
@@ -109,7 +105,7 @@
/**
* 娣诲姞鍗曟潯灞炴�у埌灞炴�ф睜
* @param osAttributeDTO
- * @return 鍒楄〃鐨勫唴瀹�
+ * @return
*/
@PostMapping( "/addAttribute")
@VciBusinessLog(operateName = "娣诲姞灞炴��")
--
Gitblit v1.9.3