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

Pu Zhibing

2025-06-18 1730a7fc4bb96f258d9dc8dec2e629cadbfdefc0

 ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/dto/MerMemberTaskPageDto.java

@@ -14,6 +14,9 @@
@Data
public class MerMemberTaskPageDto extends MerPageDto {

    @ApiModelProperty(name = "会员用户id")
    @ApiModelProperty(value = "会员用户id")
    private Long memberUserId;

    @ApiModelProperty(value = "今日",hidden = true)
    private String today;
}