From 98b1a0affd69bbe63223c21fdd2c404e8bedfccb Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 20 五月 2020 17:25:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into 2.1.2
---
fanli/src/main/java/com/yeshi/fanli/entity/bus/invite/SpreadUserImg.java | 27 ++++++++++++---------------
1 files changed, 12 insertions(+), 15 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/entity/bus/invite/SpreadUserImg.java b/fanli/src/main/java/com/yeshi/fanli/entity/bus/invite/SpreadUserImg.java
index 31f0d6b..7098458 100644
--- a/fanli/src/main/java/com/yeshi/fanli/entity/bus/invite/SpreadUserImg.java
+++ b/fanli/src/main/java/com/yeshi/fanli/entity/bus/invite/SpreadUserImg.java
@@ -2,40 +2,37 @@
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 javax.persistence.Transient;
+
+import org.yeshi.utils.mybatis.Column;
+import org.yeshi.utils.mybatis.Table;
import com.google.gson.annotations.Expose;
-@Entity
-@Table(name = "yeshi_ec_spread_user_img")
+@Table("yeshi_ec_spread_user_img")
public class SpreadUserImg {
- @Id
- @GeneratedValue(strategy = GenerationType.AUTO)
- @Column(name = "si_id")
+ @Column(name="si_id")
@Expose
- private long id;
+ private Long id;
- @Column(name = "si_uid")
+ @Column(name="si_uid")
@Expose
private Long uid;
- @Column(name = "si_type")
+ @Column(name="si_type")
@Expose
private Integer type;
- @Expose
@Column(name="si_url")
+ @Expose
private String url;
- @Expose
@Column(name="si_createtime")
+ @Expose
private Date createtime;
@Transient
@@ -49,11 +46,11 @@
this.md5 = md5;
}
- public long getId() {
+ public Long getId() {
return id;
}
- public void setId(long id) {
+ public void setId(Long id) {
this.id = id;
}
--
Gitblit v1.8.0