Merge branch 'refs/heads/dev_business' into fix/hsy/20260811

hsy

5 天以前 bb0b80bd7ca7c1f979ab0125ae01f3faa1d14f4b

 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());