From 4d6cf92e30c2c7f81f8cc31dfb7559a745782ec1 Mon Sep 17 00:00:00 2001 From: lyh <925863403@qq.com> Date: 星期一, 23 六月 2025 13:24:07 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/controller/ProductMixController.java | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/controller/ProductMixController.java b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/controller/ProductMixController.java index c91e823..8c424bd 100644 --- a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/controller/ProductMixController.java +++ b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/controller/ProductMixController.java @@ -38,6 +38,18 @@ } /** + * 鑾峰彇鍏ㄩ儴浜у搧鏍戯紙鍖呮嫭璁惧绫讳笌nc鏂囦欢锛� + * @return + */ + @AutoLog(value = "鑾峰彇鍏ㄩ儴浜у搧鏍�") + @ApiOperation(value = "鑾峰彇鍏ㄩ儴浜у搧鏍�", notes = "鑾峰彇鍏ㄩ儴浜у搧鏍�") + @GetMapping(value = "/getAllTree") + public Result<?> getAllTree() { + List<ProductMix> productMixList = iProductMixService.getProductMixTree(); + return Result.OK(productMixList); + } + + /** * 鑾峰彇鍏蜂綋灞傜骇瀹炰綋 * @param id,type * @return -- Gitblit v1.9.3