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/vo/MerMemberTaskPageVo.java

@@ -26,7 +26,11 @@
    @ApiModelProperty("任务内容")
    private String taskContent;

    @ApiModelProperty("任务内容")
    @ApiModelProperty("处理内容")
    private String dealContent;


    @ApiModelProperty("今日标记")
    private Integer todayFlag;

}