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

陶杰

2024-08-29 b2b82c1308fd2cf71e118ab8df8258f8160f010a

 src/main/java/com/mzl/flower/entity/point/CustomerPoint.java

@@ -12,18 +12,18 @@
@TableName("t_customer_point")
public class CustomerPoint extends BaseAutoEntity {

    @ApiModelProperty("名称")
    @ApiModelProperty("用户ID")
    private String userId;

    @ApiModelProperty("联系人")
    @ApiModelProperty("商户ID")
    private Long customerId;

    @ApiModelProperty("总积分")
    private String totalPoint;
    private Integer totalPoint;

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

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