代码提交--标签相关

src/main/java/com/yaoyuan/jiscuss/entity/Setting.java

@@ -2,10 +2,7 @@ package com.yaoyuan.jiscuss.entity;
 
 import java.io.Serializable;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.Table;
+import javax.persistence.*;
 
 import lombok.Data;
 
@@ -19,9 +16,12 @@ public class Setting implements Serializable{
 	private static final long serialVersionUID = 1L;
 
 	@Id
-	@Column(name="key")
-    private String key;
+	@GeneratedValue(strategy = GenerationType.IDENTITY)
+	private Integer id;
+
+	@Column(name="setting_key")
+    private String settingKey;
     
-    @Column(name="value")
-    private String value;
+    @Column(name="setting_value")
+    private String settingValue;
 }

src/main/java/com/yaoyuan/jiscuss/entity/custom/DiscussionCustom.java

@@ -1,8 +1,11 @@
 package com.yaoyuan.jiscuss.entity.custom;
 
 import com.yaoyuan.jiscuss.entity.Discussion;
+import com.yaoyuan.jiscuss.entity.Tag;
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * @author yaoyuan2.chu
  * @Title:
@@ -26,4 +29,9 @@ public class DiscussionCustom extends Discussion {
 
     private String realnameLast;
 
+    private String tag;
+
+    private List<Tag> tagList;
+
+
 }