From 91d0826fffcc79d5869b15fffe4392399d23f0b1 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期日, 26 四月 2020 17:39:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/entity/system/CustomerContent.java | 44 ++++++++++++++++++--------------------------
1 files changed, 18 insertions(+), 26 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/entity/system/CustomerContent.java b/fanli/src/main/java/com/yeshi/fanli/entity/system/CustomerContent.java
index 21ea1b5..43054af 100644
--- a/fanli/src/main/java/com/yeshi/fanli/entity/system/CustomerContent.java
+++ b/fanli/src/main/java/com/yeshi/fanli/entity/system/CustomerContent.java
@@ -2,28 +2,21 @@
import java.util.Date;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.Table;
+import org.yeshi.utils.mybatis.Column;
+import org.yeshi.utils.mybatis.Table;
import com.google.gson.annotations.Expose;
-@Entity
-@Table(name = "yeshi_ec_customer_content")
+@Table("yeshi_ec_customer_content")
public class CustomerContent {
- @Id
- @GeneratedValue(strategy = GenerationType.AUTO)
- @Column(name = "id")
@Expose
- private long id;
+ @Column(name = "id")
+ private Long id;
@Expose
@Column(name = "cn_id")
- private long cnId;
+ private Long cnId;
@Expose
@Column(name = "title")
@@ -37,27 +30,19 @@
@Column(name="createTime")
private Date createTime;
- public Date getCreateTime() {
- return createTime;
- }
-
- public void setCreateTime(Date createTime) {
- this.createTime = createTime;
- }
-
- public long getId() {
+ public Long getId() {
return id;
}
- public void setId(long id) {
+ public void setId(Long id) {
this.id = id;
}
- public long getCnId() {
+ public Long getCnId() {
return cnId;
}
- public void setCnId(long cnId) {
+ public void setCnId(Long cnId) {
this.cnId = cnId;
}
@@ -76,6 +61,13 @@
public void setContent(String content) {
this.content = content;
}
-
+
+ public Date getCreateTime() {
+ return createTime;
+ }
+
+ public void setCreateTime(Date createTime) {
+ this.createTime = createTime;
+ }
}
--
Gitblit v1.8.0