From 86f19c30b243337f1400244f3a0426c13e54a475 Mon Sep 17 00:00:00 2001
From: zhuguifei <312353457@qq.com>
Date: 星期三, 27 十一月 2024 13:46:27 +0800
Subject: [PATCH] Merge branch 'herb' of https://gitee.com/baoshwi/herb into herb

---
 jeecg-module-dry/jeecg-module-dry-biz/src/main/java/org/jeecg/modules/dry/controller/DryOpcDeviceController.java |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/jeecg-module-dry/jeecg-module-dry-biz/src/main/java/org/jeecg/modules/dry/controller/DryOpcDeviceController.java b/jeecg-module-dry/jeecg-module-dry-biz/src/main/java/org/jeecg/modules/dry/controller/DryOpcDeviceController.java
index 767677f..74860c4 100644
--- a/jeecg-module-dry/jeecg-module-dry-biz/src/main/java/org/jeecg/modules/dry/controller/DryOpcDeviceController.java
+++ b/jeecg-module-dry/jeecg-module-dry-biz/src/main/java/org/jeecg/modules/dry/controller/DryOpcDeviceController.java
@@ -30,6 +30,7 @@
 import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
 import org.jeecg.common.system.base.controller.JeecgController;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 import org.springframework.web.multipart.MultipartHttpServletRequest;
@@ -50,6 +51,7 @@
 @RestController
 @RequestMapping("/dry/dryOpcDevice")
 @Slf4j
+@ConditionalOnProperty(name = "kangaroohy.milo.enabled", havingValue = "true")
 public class DryOpcDeviceController extends JeecgController<DryOpcDevice, IDryOpcDeviceService> {
 	@Autowired
 	private IDryOpcDeviceService dryOpcDeviceService;

--
Gitblit v1.9.3