From 4e6d6e7c8e4ca42e96528a71162f5e58e473f652 Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期五, 11 七月 2025 09:37:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev

---
 consumer/src/main/resources/application.yml |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/consumer/src/main/resources/application.yml b/consumer/src/main/resources/application.yml
index 042711c..f7351bd 100644
--- a/consumer/src/main/resources/application.yml
+++ b/consumer/src/main/resources/application.yml
@@ -38,7 +38,7 @@
   redis:
     host: 127.0.0.1
     port: 6379
-#    password: lilishop
+    #    password: lilishop
     lettuce:
       pool:
         # 杩炴帴姹犳渶澶ц繛鎺ユ暟锛堜娇鐢ㄨ礋鍊艰〃绀烘病鏈夐檺鍒讹級 榛樿 8
@@ -247,8 +247,8 @@
     #      account:
     #        username: elastic
     #        password: LiLiShopES
-#    logstash:
-#      server: 127.0.0.1:4560
+    #    logstash:
+    #      server: 127.0.0.1:4560
     rocketmq:
       promotion-topic: lili_promotion_topic
       promotion-group: lili_promotion_group

--
Gitblit v1.8.0