From f84d9e69907cb678150eaa6393fd74cf042fcca4 Mon Sep 17 00:00:00 2001 From: zenglf <18502938215@163.com> Date: 星期四, 28 九月 2023 14:39:03 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' into develop --- lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcDriveTypeParamConfigController.java | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcDriveTypeParamConfigController.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcDriveTypeParamConfigController.java index c740de6..984bb08 100644 --- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcDriveTypeParamConfigController.java +++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcDriveTypeParamConfigController.java @@ -11,6 +11,7 @@ import org.jeecg.common.aspect.annotation.AutoLog; import org.jeecg.common.system.base.controller.JeecgController; import org.jeecg.common.system.query.QueryGenerator; +import org.jeecg.modules.mdc.dto.OptionsDto; import org.jeecg.modules.mdc.entity.MdcDriveTypeParamConfig; import org.jeecg.modules.mdc.service.IMdcDriveTypeParamConfigService; import org.springframework.web.bind.annotation.*; @@ -160,4 +161,12 @@ return Result.OK(list); } + @AutoLog(value = "椹卞姩鍙傛暟閰嶇疆-鑾峰彇鎺у埗绯荤粺绫诲瀷涓嬫媺妗嗛�夐」") + @ApiOperation(value = "椹卞姩鍙傛暟閰嶇疆-鑾峰彇鎺у埗绯荤粺绫诲瀷涓嬫媺妗嗛�夐」", notes = "椹卞姩鍙傛暟閰嶇疆-鑾峰彇鎺у埗绯荤粺绫诲瀷涓嬫媺妗嗛�夐」") + @GetMapping(value = "/getDriveParamOptions") + public Result<List<OptionsDto>> getDriveParamOptions() { + List<OptionsDto> result = mdcDriveTypeParamConfigService.getDriveParamOptions(); + return Result.OK(result); + } + } -- Gitblit v1.9.3