Commit 61d9397afce3eb73899b127e4c3c77e9bd7e937d
Merge remote-tracking branch 'origin/dev' into test
Showing
2 changed files
with
1 additions
and
8 deletions
fw-hermes-domain/src/main/java/cn/fw/hermes/domain/db/ChatPullRecord.java
1 | package cn.fw.hermes.domain.db; | 1 | package cn.fw.hermes.domain.db; |
2 | 2 | ||
3 | import cn.fw.common.data.entity.BaseEntity; | 3 | import cn.fw.common.data.entity.BaseEntity; |
4 | -import cn.fw.data.base.db.annotation.DbTable; | ||
5 | import lombok.Data; | 4 | import lombok.Data; |
6 | 5 | ||
7 | import java.util.Date; | 6 | import java.util.Date; |
8 | 7 | ||
9 | /** | 8 | /** |
10 | - * | ||
11 | - * | ||
12 | * @Author: liwei | 9 | * @Author: liwei |
13 | * @Date: 2018/12/10 19:51 | 10 | * @Date: 2018/12/10 19:51 |
14 | */ | 11 | */ |
15 | @Data | 12 | @Data |
16 | -@DbTable("chat_pull_record") | ||
17 | public class ChatPullRecord extends BaseEntity<ChatPullRecord, Long> { | 13 | public class ChatPullRecord extends BaseEntity<ChatPullRecord, Long> { |
18 | 14 | ||
19 | /** | 15 | /** |
fw-hermes-domain/src/main/java/cn/fw/hermes/domain/db/ChatRecord.java
1 | package cn.fw.hermes.domain.db; | 1 | package cn.fw.hermes.domain.db; |
2 | 2 | ||
3 | import cn.fw.common.data.entity.BaseEntity; | 3 | import cn.fw.common.data.entity.BaseEntity; |
4 | -import cn.fw.data.base.db.annotation.DbTable; | ||
5 | import lombok.Data; | 4 | import lombok.Data; |
6 | 5 | ||
7 | import java.util.Date; | 6 | import java.util.Date; |
8 | 7 | ||
9 | /** | 8 | /** |
10 | - * | ||
11 | * 聊天记录 | 9 | * 聊天记录 |
12 | * | 10 | * |
13 | * @Author: liwei | 11 | * @Author: liwei |
14 | * @Date: 2018/12/10 16:05 | 12 | * @Date: 2018/12/10 16:05 |
15 | */ | 13 | */ |
16 | @Data | 14 | @Data |
17 | -@DbTable("chat_record") | ||
18 | public class ChatRecord extends BaseEntity<ChatRecord, Long> { | 15 | public class ChatRecord extends BaseEntity<ChatRecord, Long> { |
19 | /** | 16 | /** |
20 | - *消息发送者 | 17 | + * 消息发送者 |
21 | */ | 18 | */ |
22 | private String fromAccount; | 19 | private String fromAccount; |
23 | 20 |