From ee982b85c9ff09fbf6a6eb7c133b1e6f5fb160ba Mon Sep 17 00:00:00 2001
From: liu <2021943741@qq.com>
Date: 星期五, 14 八月 2026 14:56:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_business' into dev_business

---
 yudao-module-mall/yudao-module-promotion/src/test/java/cn/iocoder/yudao/module/promotion/service/seckillactivity/SeckillActivityServiceImplTest.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/yudao-module-mall/yudao-module-promotion/src/test/java/cn/iocoder/yudao/module/promotion/service/seckillactivity/SeckillActivityServiceImplTest.java b/yudao-module-mall/yudao-module-promotion/src/test/java/cn/iocoder/yudao/module/promotion/service/seckillactivity/SeckillActivityServiceImplTest.java
index ad837f5..f34282e 100644
--- a/yudao-module-mall/yudao-module-promotion/src/test/java/cn/iocoder/yudao/module/promotion/service/seckillactivity/SeckillActivityServiceImplTest.java
+++ b/yudao-module-mall/yudao-module-promotion/src/test/java/cn/iocoder/yudao/module/promotion/service/seckillactivity/SeckillActivityServiceImplTest.java
@@ -26,7 +26,7 @@
 /**
 * {@link SeckillActivityServiceImpl} 鐨勫崟鍏冩祴璇曠被
 *
-* @author 鑺嬮亾婧愮爜
+* @author 瓒呯骇绠$悊鍛�
 */
 @Import(SeckillActivityServiceImpl.class)
 @Disabled // TODO 鑺嬭壙锛氭湭鏉ュ紑鍚�

--
Gitblit v1.9.3