管理台bug和用户端

jiangqs

2023-07-08 c71055635df3d75e5dc838a9b66036c591913a13

 ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/poji/member/MemberGiftRecord.java

File was renamed from ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/pojo/member/MemberGiftRecord.java
@@ -1,7 +1,6 @@
package com.ruoyi.member.domain.pojo.member;
package com.ruoyi.system.api.domain.poji.member;

import com.baomidou.mybatisplus.activerecord.Model;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
@@ -29,8 +28,8 @@

    private static final long serialVersionUID = 1L;

    @TableId(value = "id", type = IdType.AUTO)
    private Long id;
    @TableId(value = "prize_id")
    private String prizeId;
    /**
     * 删除标记
     */
@@ -121,10 +120,16 @@
    @TableField("gift_year")
    private String giftYear;

    /**
     * 核销状态1未核销2已核销
     */
    @TableField("verify_status")
    private Integer verifyStatus;


    @Override
    protected Serializable pkVal() {
        return this.id;
        return this.prizeId;
    }

}