Merge remote-tracking branch 'origin/master'

puzhibing

2023-07-14 c81d766cd91be3b3a24c8db94dcd93c071a66c62

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

@@ -44,21 +44,26 @@
    @TableField("userId")
    private Integer userId;
    /**
     * 状态（1=待核销，2=已核销）
     */
    @TableField("status")
    private Integer status;
    /**
     * 核销人员id
     */
    @TableField("verificationUserId")
    private Integer verificationUserId;
    /**
     * 核销门店id
     */
    @TableField("verifiStoreId")
    private Integer verifiStoreId;
    /**
     * 核销时间
     */
    @TableField("verificationTime")
    private Date verificationTime;
    /**
     * 状态（1=待核销，2=已核销）
     */
    @TableField("status")
    private Integer status;
    /**
     * 领取时间
     */
    @TableField("insertTime")