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

huliguo

6 小时以前 c5d38d650d2ac4101b1293a4f17346e7d5420076

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