Merge branch 'master' of ssh://sinata.cn:20202/java/HongRuiTang into master

jiangqs

2023-05-10 7a49bcc5e561df7a9b65266a57a9c0896c0fd3d0

 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;
}