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

Pu Zhibing

2 天以前 1730a7fc4bb96f258d9dc8dec2e629cadbfdefc0

 ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/dto/MemberTotalChangeDto.java

@@ -65,5 +65,6 @@
    @ApiModelProperty(value="订单")
    private String orderNo;


    @ApiModelProperty(value="消费记录")
    private Date consumeTime;
}