旗开得胜

src/main/java/com/greenorange/promotion/model/entity/User.java

@@ -1,76 +0,0 @@
-package com.greenorange.promotion.model.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 java.io.Serializable;
-import java.util.Date;
-import lombok.Data;
-
-/**
- * 用户表
- * @TableName user
- */
-@TableName(value ="user")
-@Data
-public class User implements Serializable {
-    /**
-     * id
-     */
-    @TableId(type = IdType.AUTO)
-    private Long id;
-
-    /**
-     * 账号
-     */
-    private String userAccount;
-
-    /**
-     * 密码
-     */
-    private String userPassword;
-
-    /**
-     * 小程序openId
-     */
-    private String miniOpenId;
-
-    /**
-     * 用户昵称
-     */
-    private String userName;
-
-    /**
-     * 用户头像
-     */
-    private String userAvatar;
-
-    /**
-     * 积分
-     */
-    private Integer points;
-
-    /**
-     * 用户角色
-     */
-    private String userRole;
-
-    /**
-     * 创建时间
-     */
-    private Date createTime;
-
-    /**
-     * 更新时间
-     */
-    private Date updateTime;
-
-    /**
-     * 是否删除
-     */
-    private Integer isDelete;
-
-    @TableField(exist = false)
-    private static final long serialVersionUID = 1L;
-}

src/main/java/com/greenorange/promotion/model/entity/UserInfo.java

@@ -49,7 +49,7 @@ public class UserInfo implements Serializable {
     /**
      * 用户角色
      */
-    private Object userRole;
+    private String userRole;
 
     /**
      * 上级用户id