Merge remote-tracking branch 'origin/master'

CBin

2023-08-02 88b0f7ea048e9b201af0bc390f3da8840b11c899

 ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/dto/MgtMemberIntegralPageDto.java

@@ -21,10 +21,10 @@
    private Long memberUserId;

    @ApiModelProperty(value = "变动开始时间")
    private Date changeStartDate;
    private String changeStartDate;

    @ApiModelProperty(value = "变动结束时间")
    private Date changeEndDate;
    private String changeEndDate;


}