zm/nuttyreading-java
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

merge master

Browse Source
This commit is contained in:
Cauchy
2023-10-18 17:16:45 +08:00
parent f1b072d6c3 8f7f785ba9
commit 19a2ef58a9
32 changed files with 216 additions and 259 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/peanut/modules/book/entity/BookClockInChatEntity.java → src/main/java/com/peanut/modules/book/entity/BookClockEntryChatEntity.java
View File

@@ -12,7 +12,7 @@ import java.util.List;
@Data
@TableName("book_clock_entry_chat")
public class BookClockInChatEntity implements Serializable {
public class BookClockEntryChatEntity implements Serializable {
private static final long serialVersionUID = 1L;
@TableId

2
src/main/java/com/peanut/modules/book/entity/BookForumArticlesEntity.java
View File

@@ -102,7 +102,7 @@ public class BookForumArticlesEntity {
//说话的人
@TableField(exist = false)
private UserEntity user;
private MyUserEntity user;

4
src/main/java/com/peanut/modules/book/entity/BookForumCommentEntity.java
View File

@@ -70,11 +70,11 @@ public class BookForumCommentEntity {
//发言者
@TableField(exist = false)
private UserEntity user;
private MyUserEntity user;
//对谁说
@TableField(exist = false)
private UserEntity puser;
private MyUserEntity puser;
//子对话
@TableField(exist = false)

3
src/main/java/com/peanut/modules/book/entity/BuyOrder.java
View File

@@ -169,4 +169,7 @@ public class BuyOrder implements Serializable {
@TableField(exist = false)
private Long timestamp;
@TableField(exist = false)
private MyUserEntity user;
}

65
src/main/java/com/peanut/modules/book/entity/UserEntity.java
View File

@@ -1,65 +0,0 @@
package com.peanut.modules.book.entity;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import java.math.BigDecimal;
import java.util.Date;
@Data
@TableName("user")
public class UserEntity {
private static final long serialVersionUID = 1L;
@TableId
@TableField("id")
private Integer id;
private String name;
private Integer age;
private Integer sex;
private String avatar;
private String nickname;
private String tel;
private String password;
private String vip;
@TableField("vip_start_time")
private Date vipStartTime;
@TableField("vip_validtime")
private Date vipValidtime;
@TableField("peanut_coin")
private BigDecimal peanutCoin;
@TableField("read_time")
private Date readTime;
@TableField("last_login_time")
private Date lastLoginTime;
@TableField("yljk_oid")
private String yljkOid;
@TableField("create_time")
private Date createTime;
@TableField("update_time")
private Date updateTime;
@TableField("del_flag")
private Integer delFlag;
private String remark;
}