修复

ruoyi-catdog/src/main/java/com/ruoyi/model/domain/AppUsers.java

@@ -1,33 +1,38 @@
-package com.ruoyi.model.domain;
+package com.ruoyi.model.model.entity;
 
 import java.math.BigDecimal;
-import java.util.Date;
-
-import com.baomidou.mybatisplus.annotation.TableField;
+import java.time.LocalDateTime;
 import com.fasterxml.jackson.annotation.JsonFormat;
-import lombok.Data;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
 import com.ruoyi.common.annotation.Excel;
-import com.ruoyi.common.core.domain.BaseEntity;
-
+import lombok.Data;
 /**
- * 用户对象 app_users
- * 
- * @author ruoyi
- * @date 2025-03-08
+ * 用户表对象 app_users
+ *
+ * @author daixiande
  */
 @Data
-public class AppUsers extends BaseEntity
-{
+public class AppUsers {
     private static final long serialVersionUID = 1L;
 
     /** 用户编号 */
     private Long userId;
 
+    /** 创建人 */
+    private String createBy;
+
+    /** 创建时间 */
+    private LocalDateTime createTime;
+
     /** 逻辑删除 */
     private Integer delFlag;
 
+    /** 备注 */
+    @Excel(name = "备注")
+    private String remark;
+
+    /** 修改时间 */
+    private LocalDateTime updateTime;
+
     /** 修改人 */
     @Excel(name = "修改人")
     private String updatorBy;
@@ -62,173 +67,31 @@ public class AppUsers extends BaseEntity
 
     /** 过期时间 */
     @Excel(name = "过期时间")
-    private Long expiresIn;
+    private Integer expiresIn;
 
     /** 刷新token */
     @Excel(name = "刷新token")
     private String refreshToken;
 
     /** 过期时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "过期时间", width = 30, dateFormat = "yyyy-MM-dd")
-    private Date expireTime;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "过期时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime expireTime;
 
     /** 是否合伙人 */
     @Excel(name = "是否合伙人")
     private Integer userHh;
+
     /** 是否伴宠师 */
     @Excel(name = "是否伴宠师")
     private Integer userBcs;
 
-    @TableField(exist = false)
-    private Date recentlyPayTime;
-    @TableField(exist = false)
-    private BigDecimal accumulate_money = new BigDecimal(100) ;
-    @TableField(exist = false)
-    private BigDecimal reward_money = new BigDecimal(99) ;
-
-
-
-
-
-//    public void setUserId(Long userId)
-//    {
-//        this.userId = userId;
-//    }
-//
-//    public Long getUserId()
-//    {
-//        return userId;
-//    }
-//    public void setDelFlag(Integer delFlag)
-//    {
-//        this.delFlag = delFlag;
-//    }
-//
-//    public Integer getDelFlag()
-//    {
-//        return delFlag;
-//    }
-//    public void setUpdatorBy(String updatorBy)
-//    {
-//        this.updatorBy = updatorBy;
-//    }
-//
-//    public String getUpdatorBy()
-//    {
-//        return updatorBy;
-//    }
-//    public void setUserImage(String userImage)
-//    {
-//        this.userImage = userImage;
-//    }
-//
-//    public String getUserImage()
-//    {
-//        return userImage;
-//    }
-//    public void setUserName(String userName)
-//    {
-//        this.userName = userName;
-//    }
-//
-//    public String getUserName()
-//    {
-//        return userName;
-//    }
-//    public void setUserState(Long userState)
-//    {
-//        this.userState = userState;
-//    }
-//
-//    public Long getUserState()
-//    {
-//        return userState;
-//    }
-//    public void setUserTelephone(String userTelephone)
-//    {
-//        this.userTelephone = userTelephone;
-//    }
-//
-//    public String getUserTelephone()
-//    {
-//        return userTelephone;
-//    }
-//    public void setUnionid(String unionid)
-//    {
-//        this.unionid = unionid;
-//    }
-//
-//    public String getUnionid()
-//    {
-//        return unionid;
-//    }
-//    public void setOpenid(String openid)
-//    {
-//        this.openid = openid;
-//    }
-//
-//    public String getOpenid()
-//    {
-//        return openid;
-//    }
-//    public void setAccessToken(String accessToken)
-//    {
-//        this.accessToken = accessToken;
-//    }
-//
-//    public String getAccessToken()
-//    {
-//        return accessToken;
-//    }
-//    public void setExpiresIn(Long expiresIn)
-//    {
-//        this.expiresIn = expiresIn;
-//    }
-//
-//    public Long getExpiresIn()
-//    {
-//        return expiresIn;
-//    }
-//    public void setRefreshToken(String refreshToken)
-//    {
-//        this.refreshToken = refreshToken;
-//    }
-//
-//    public String getRefreshToken()
-//    {
-//        return refreshToken;
-//    }
-//    public void setExpireTime(Date expireTime)
-//    {
-//        this.expireTime = expireTime;
-//    }
-//
-//    public Date getExpireTime()
-//    {
-//        return expireTime;
-//    }
-//
-//    @Override
-//    public String toString() {
-//        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-//            .append("userId", getUserId())
-//            .append("createBy", getCreateBy())
-//            .append("createTime", getCreateTime())
-//            .append("delFlag", getDelFlag())
-//            .append("remark", getRemark())
-//            .append("updateTime", getUpdateTime())
-//            .append("updatorBy", getUpdatorBy())
-//            .append("userImage", getUserImage())
-//            .append("userName", getUserName())
-//            .append("userState", getUserState())
-//            .append("userTelephone", getUserTelephone())
-//            .append("unionid", getUnionid())
-//            .append("openid", getOpenid())
-//            .append("accessToken", getAccessToken())
-//            .append("expiresIn", getExpiresIn())
-//            .append("refreshToken", getRefreshToken())
-//            .append("expireTime", getExpireTime())
-//            .toString();
-//    }
+    /** 钱包金额 */
+    @Excel(name = "钱包金额")
+    private BigDecimal price;
+
+    /** 邀请码 */
+    @Excel(name = "邀请码")
+    private String invitationCode;
+
 }