合并代码

puzhibing

2023-07-07 c148720d31eb2f8d68352e64eaddf17fd5b66a5a

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

@@ -1,6 +1,7 @@
package com.dsh.activity.entity;

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.extension.activerecord.Model;
@@ -35,26 +36,32 @@
    /**
     * 优惠券id
     */
    @TableField("pointsMerchandiseId")
    private Integer pointsMerchandiseId;
    /**
     * 用户id
     */
    @TableField("userId")
    private Integer userId;
    /**
     * 状态（1=待核销，2=已核销）
     */
    @TableField("status")
    private Integer status;
    /**
     * 核销人员id
     */
    @TableField("verificationUserId")
    private Integer verificationUserId;
    /**
     * 核销时间
     */
    @TableField("verificationTime")
    private Date verificationTime;
    /**
     * 领取时间
     */
    @TableField("insertTime")
    private Date insertTime;