Merge remote-tracking branch 'origin/master'

puzhibing

2023-08-07 189936d6735ceb02b6030fd274817fce0c228c10

 cloud-server-activity/src/main/java/com/dsh/activity/entity/UserPointsMerchandise.java

@@ -31,7 +31,7 @@
    /**
     * 主键
     */
    @TableId(value = "id", type = IdType.INPUT)
    @TableId(value = "id", type = IdType.NONE)
    private Long id;
    /**
     * 优惠券id
@@ -83,7 +83,11 @@
     */
    @TableField("orderNumber")
    private String orderNumber;

    /**
     * 现金的支付状态
     */
    @TableField("payStatus")
    private Integer payStatus;

    @Override
    protected Serializable pkVal() {