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

gongzuming

2024-09-08 55db77e61e5a55c30dc19d599dadcfc1469c962e

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

@@ -15,9 +15,6 @@
    @ApiModelProperty(value = "商户ID")
    private Long customerId;

    @ApiModelProperty(value = "兑换单号")
    private String recordNo;

    @ApiModelProperty(value = "兑换码")
    private String redeemCode;

@@ -37,14 +34,17 @@
    private String pictures;

    @ApiModelProperty(value = "兑换积分数")
    private String point;
    private Integer point;

    @ApiModelProperty(value = "兑换数量")
    private String num;
    private Integer num;

    @ApiModelProperty(value = "兑换总积分")
    private String totalPoint;
    private Integer totalPoint;

    @ApiModelProperty(value = "兑换状态")
    @ApiModelProperty(value = "兑换券状态POINT_GOODS_RECORD_STATUS")
    private String status;

    @ApiModelProperty(value = "绑定订单ID")
    private String orderId;
}