From dd5b15229cb15459fa7c31ccea77dac28cbfafbd Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期一, 13 四月 2020 10:04:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/entity/taobao/TaobaoMeterial.java | 7 -------
1 files changed, 0 insertions(+), 7 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/entity/taobao/TaobaoMeterial.java b/fanli/src/main/java/com/yeshi/fanli/entity/taobao/TaobaoMeterial.java
index 3ca5a16..e746bc7 100644
--- a/fanli/src/main/java/com/yeshi/fanli/entity/taobao/TaobaoMeterial.java
+++ b/fanli/src/main/java/com/yeshi/fanli/entity/taobao/TaobaoMeterial.java
@@ -8,7 +8,6 @@
import javax.persistence.GeneratedValue;
import javax.persistence.GenerationType;
import javax.persistence.Id;
-import javax.persistence.JoinColumn;
import javax.persistence.Table;
/**
@@ -18,7 +17,6 @@
*
* @date 2018骞�8鏈�24鏃�
*/
-@Entity
@Table(name = "yeshi_ec_taobao_meterial")
@org.yeshi.utils.mybatis.Table("yeshi_ec_taobao_meterial")
public class TaobaoMeterial implements Serializable{
@@ -35,24 +33,19 @@
@org.yeshi.utils.mybatis.Column(name = "tm_id")
private Long id;
- @JoinColumn(name = "tm_class_name")
@org.yeshi.utils.mybatis.Column(name = "tm_class_name")
private String className;// 鍚嶇О
- @JoinColumn(name = "tm_super_name")
@org.yeshi.utils.mybatis.Column(name = "tm_super_name")
private String superName; // 涓婄骇绫荤洰
- @JoinColumn(name = "tm_material_id")
@org.yeshi.utils.mybatis.Column(name = "tm_material_id")
private Integer materialId; // 閫氱敤鐗╂枡id
- @JoinColumn(name = "tm_createtime")
@org.yeshi.utils.mybatis.Column(name = "tm_createtime")
private Date createtime; // 鍒涘缓鏃堕棿
- @JoinColumn(name = "tm_updatetime")
@org.yeshi.utils.mybatis.Column(name = "tm_updatetime")
private Date updatetime; // 鏇存柊鏃堕棿锛堜慨鏀规椂闂达級
--
Gitblit v1.8.0