Merge branch 'master' of http://sinata.cn:10101/gitblit/r/java/HongRuiTang

zhanglin8526

2023-05-10 39748c770c83ff1b1e4593c5f24b147361e587c0

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

@@ -16,4 +16,7 @@

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

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