Merge remote-tracking branch 'origin/master'

CBin

2023-08-02 88b0f7ea048e9b201af0bc390f3da8840b11c899

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

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

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

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