Merge remote-tracking branch 'origin/2.0' into 2.0

Pu Zhibing

2025-06-30 ad87f297e0f5e19b10180eafc4c41802666d754f

 ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/dto/MemberIntegralChangeDto.java

@@ -13,6 +13,9 @@
@Data
public class MemberIntegralChangeDto {

    @ApiModelProperty(value = "用户id")
    private Long userId;

    @ApiModelProperty(value = "会员id")
    private String memberId;