Merge remote-tracking branch 'origin/master-v2'

gongzuming

2024-09-20 35309b932b738d5a8537e53207d28004a8da0f89

 src/main/java/com/mzl/flower/dto/response/point/CustomerPointDetailDTO.java

@@ -1,6 +1,7 @@
package com.mzl.flower.dto.response.point;

import com.mzl.flower.base.AbstractTransDTO;
import com.mzl.flower.base.annotation.DictTrans;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

@@ -8,6 +9,8 @@

@Data
public class CustomerPointDetailDTO extends AbstractTransDTO {

    private Long id;

    @ApiModelProperty("记录日期")
    private LocalDate recordDate;
@@ -18,20 +21,22 @@
    @ApiModelProperty("商户ID")
    private Long customerId;

    @ApiModelProperty("积分变更类型-point_change_type")
    @ApiModelProperty("积分变更类型-POINT_CHANGE_TYPE")
    @DictTrans(target = "changeTypeStr",codeType = "POINT_CHANGE_TYPE")
    private String changeType;

    @ApiModelProperty("积分类型-point_type")
    @ApiModelProperty("积分类型-POINT_TYPE")
    @DictTrans(target = "typeStr",codeType = "POINT_TYPE")
    private String type;

    @ApiModelProperty("积分变更类型-point_change_type")
    private String changeTypeStr;

    @ApiModelProperty("积分类型-POINT_TYPE")
    private String typeStr;

    @ApiModelProperty("积分")
    private String point;

    @ApiModelProperty("使用积分")
    private String usePoint;

    @ApiModelProperty("过期积分")
    private String expiredPoint;

    @ApiModelProperty("积分备注")
    private String remarks;