From 21a9ec4a797e26e49a14f386e054da3cb0afc376 Mon Sep 17 00:00:00 2001 From: puzhibing <393733352@qq.com> Date: 星期五, 14 七月 2023 09:25:38 +0800 Subject: [PATCH] 同步代码 --- cloud-server-activity/src/main/java/com/dsh/activity/entity/UserPointsMerchandise.java | 11 +++++++++-- 1 files changed, 9 insertions(+), 2 deletions(-) diff --git a/cloud-server-activity/src/main/java/com/dsh/activity/entity/UserPointsMerchandise.java b/cloud-server-activity/src/main/java/com/dsh/activity/entity/UserPointsMerchandise.java index 1bba930..22f0842 100644 --- a/cloud-server-activity/src/main/java/com/dsh/activity/entity/UserPointsMerchandise.java +++ b/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; @@ -30,31 +31,37 @@ /** * 主键 */ - @TableId(value = "id", type = IdType.AUTO) - private Integer id; + @TableId(value = "id", type = IdType.INPUT) + private Long id; /** * 优惠券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; -- Gitblit v1.7.1