From 573c491b4a1ba60e12a5678a01c1546c0077c1ee Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 30 七月 2019 09:07:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 fanli/src/main/java/com/yeshi/fanli/entity/bus/recommend/MaskKey.java |   18 +++++++-----------
 1 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/entity/bus/recommend/MaskKey.java b/fanli/src/main/java/com/yeshi/fanli/entity/bus/recommend/MaskKey.java
index ca6ebba..d121402 100644
--- a/fanli/src/main/java/com/yeshi/fanli/entity/bus/recommend/MaskKey.java
+++ b/fanli/src/main/java/com/yeshi/fanli/entity/bus/recommend/MaskKey.java
@@ -1,11 +1,7 @@
 package com.yeshi.fanli.entity.bus.recommend;
 
-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;
 
 /**
  * 閾劅璇嶅簱
@@ -13,14 +9,14 @@
  * @author Administrator
  *
  */
-@Entity
-@Table(name = "yeshi_ec_mask_key")
+@Table("yeshi_ec_mask_key")
 public class MaskKey {
-	@Id
-	@GeneratedValue(strategy = GenerationType.AUTO)
-	@Column(name = "`id`")
+	
+	@Column(name = "id")
 	private long id;
+	@Column(name = "content")
 	private String content;
+	
 
 	public MaskKey() {
 

--
Gitblit v1.8.0