Merge remote-tracking branch 'origin/master'

luodangjia

2024-12-04 a981c07d34edd0975b9d556d97c1f851ce79974c

 ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/vo/UserPointVO.java

@@ -1,11 +1,8 @@
package com.ruoyi.account.vo;

import com.baomidou.mybatisplus.annotation.TableField;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.math.BigDecimal;

@Data
@ApiModel(value="UserPoint对象", description="")
@@ -15,17 +12,17 @@
    private Integer totalPoint;

    @ApiModelProperty(value = "消费积分数")
    private BigDecimal shopPoint;
    private Integer shopPoint;

    @ApiModelProperty(value = "返佣积分数")
    private BigDecimal sharePoint;
    private Integer sharePoint;

    @ApiModelProperty(value = "拉新积分")
    private BigDecimal pullNewPoint;
    private Integer pullNewPoint;

    @ApiModelProperty(value = "门店业绩积分")
    private BigDecimal shopAchievementPoint;
    private Integer shopAchievementPoint;

    @ApiModelProperty(value = "门店返佣积分")
    private BigDecimal shopSharePoint;
    private Integer shopSharePoint;
}