From b48ed5159987e8cee81bc765010cfd9393ad7003 Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期四, 13 八月 2026 13:28:09 +0800
Subject: [PATCH] Merge branch 'dev_business' of http://114.132.189.42:9002/r/mom-pro2-after into dev_business

---
 yudao-module-mall/yudao-module-promotion/src/test/java/cn/iocoder/yudao/module/promotion/service/combination/CombinationRecordServiceImplTest.java |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/yudao-module-mall/yudao-module-promotion/src/test/java/cn/iocoder/yudao/module/promotion/service/combination/CombinationRecordServiceImplTest.java b/yudao-module-mall/yudao-module-promotion/src/test/java/cn/iocoder/yudao/module/promotion/service/combination/CombinationRecordServiceImplTest.java
index 5a07773..5b507ed 100644
--- a/yudao-module-mall/yudao-module-promotion/src/test/java/cn/iocoder/yudao/module/promotion/service/combination/CombinationRecordServiceImplTest.java
+++ b/yudao-module-mall/yudao-module-promotion/src/test/java/cn/iocoder/yudao/module/promotion/service/combination/CombinationRecordServiceImplTest.java
@@ -37,7 +37,7 @@
 /**
  * {@link CombinationRecordServiceImpl} 鐨勫崟鍏冩祴璇曠被
  *
- * @author 鑺嬮亾婧愮爜
+ * @author 瓒呯骇绠$悊鍛�
  */
 @Import(CombinationRecordServiceImpl.class)
 public class CombinationRecordServiceImplTest extends BaseDbUnitTest {
@@ -269,7 +269,7 @@
     private void mockCreateContext() {
         MemberUserRespDTO user = randomPojo(MemberUserRespDTO.class, o -> {
             o.setId(USER_ID);
-            o.setNickname("鑺嬮亾婧愮爜");
+            o.setNickname("瓒呯骇绠$悊鍛�");
             o.setAvatar("https://www.iocoder.cn/avatar.png");
         });
         when(memberUserApi.getUser(USER_ID)).thenReturn(user);
@@ -305,7 +305,7 @@
             o.setSkuId(SKU_ID);
             o.setCount(1);
             o.setUserId(USER_ID);
-            o.setNickname("鑺嬮亾婧愮爜");
+            o.setNickname("瓒呯骇绠$悊鍛�");
             o.setAvatar("https://www.iocoder.cn/avatar.png");
             o.setHeadId(CombinationRecordDO.HEAD_ID_GROUP);
             o.setStatus(CombinationRecordStatusEnum.IN_PROGRESS.getStatus());

--
Gitblit v1.9.3