diff --git a/ruoyi-common/ruoyi-common-elasticsearch/src/main/java/com/ruoyi/common/elasticsearch/config/EasyEsConfiguration.java b/ruoyi-common/ruoyi-common-elasticsearch/src/main/java/com/ruoyi/common/elasticsearch/config/EasyEsConfiguration.java
index cc67e936..7e151e74 100644
--- a/ruoyi-common/ruoyi-common-elasticsearch/src/main/java/com/ruoyi/common/elasticsearch/config/EasyEsConfiguration.java
+++ b/ruoyi-common/ruoyi-common-elasticsearch/src/main/java/com/ruoyi/common/elasticsearch/config/EasyEsConfiguration.java
@@ -2,6 +2,7 @@ package com.ruoyi.common.elasticsearch.config;
 
 import cn.easyes.starter.register.EsMapperScan;
 import org.springframework.boot.autoconfigure.AutoConfiguration;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 
 /**
  * easy-es 配置
@@ -9,6 +10,7 @@ import org.springframework.boot.autoconfigure.AutoConfiguration;
  * @author Lion Li
  */
 @AutoConfiguration
+@ConditionalOnProperty(value = "easy-es.enable", havingValue = "true")
 @EsMapperScan("com.ruoyi.**.esmapper")
 public class EasyEsConfiguration {
 
diff --git a/ruoyi-example/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/EsCrudController.java b/ruoyi-example/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/EsCrudController.java
index e53481b2..2e2ebae0 100644
--- a/ruoyi-example/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/EsCrudController.java
+++ b/ruoyi-example/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/EsCrudController.java
@@ -5,6 +5,7 @@ import com.ruoyi.common.core.domain.R;
 import com.ruoyi.demo.domain.Document;
 import com.ruoyi.demo.esmapper.DocumentMapper;
 import lombok.RequiredArgsConstructor;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
@@ -14,6 +15,7 @@ import java.util.List;
  *
  * @author Lion Li
  */
+@ConditionalOnProperty(value = "easy-es.enable", havingValue = "true")
 @RestController
 @RequiredArgsConstructor
 public class EsCrudController {