From db9b3f501855ed7d97315c27c538de05bb0f7eaf Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期二, 12 十一月 2019 15:26:26 +0800
Subject: [PATCH] 赠送礼品退回
---
fanli/src/main/java/com/yeshi/fanli/entity/bus/lable/MergeClass.java | 44 +++++++++-----------------------------------
1 files changed, 9 insertions(+), 35 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/entity/bus/lable/MergeClass.java b/fanli/src/main/java/com/yeshi/fanli/entity/bus/lable/MergeClass.java
index cb45339..856c4ca 100644
--- a/fanli/src/main/java/com/yeshi/fanli/entity/bus/lable/MergeClass.java
+++ b/fanli/src/main/java/com/yeshi/fanli/entity/bus/lable/MergeClass.java
@@ -1,19 +1,9 @@
package com.yeshi.fanli.entity.bus.lable;
-import java.io.Serializable;
import java.util.Date;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-import javax.persistence.Table;
-
-import com.yeshi.fanli.entity.common.AdminUser;
+import org.yeshi.utils.mybatis.Column;
+import org.yeshi.utils.mybatis.Table;
/**
* 9k9缁勫悎绫�
@@ -22,41 +12,25 @@
*
* @date 2018骞�6鏈�27鏃�
*/
-@Entity
-@Table(name = "yeshi_ec_class_9k9")
-@org.yeshi.utils.mybatis.Table("yeshi_ec_class_9k9")
-public class MergeClass implements Serializable{
+@Table("yeshi_ec_class_9k9")
+public class MergeClass {
-
- /**
- *
- */
- private static final long serialVersionUID = 1L;
-
- @Id
@Column(name = "k_id")
- @GeneratedValue(strategy = GenerationType.AUTO)
- @org.yeshi.utils.mybatis.Column(name = "k_id")
private Long id;
- @JoinColumn(name = "k_name")
- @org.yeshi.utils.mybatis.Column(name = "k_name")
+ @Column(name = "k_name")
private String name;// 鍚嶇О
- @JoinColumn(name = "k_merge_cid")
- @org.yeshi.utils.mybatis.Column(name = "k_merge_cid")
+ @Column(name = "k_merge_cid")
private String mergeCids; // 绯荤粺绫籭d(閫楀彿闅斿紑)
- @JoinColumn(name = "k_weight")
- @org.yeshi.utils.mybatis.Column(name = "k_weight")
+ @Column(name = "k_weight")
private Double weight; // 鏉冮噸
- @JoinColumn(name = "k_createtime")
- @org.yeshi.utils.mybatis.Column(name = "k_createtime")
+ @Column(name = "k_createtime")
private Date createtime; // 鍒涘缓鏃堕棿
- @JoinColumn(name = "k_updatetime")
- @org.yeshi.utils.mybatis.Column(name = "k_updatetime")
+ @Column(name = "k_updatetime")
private Date updatetime; // 鏇存柊鏃堕棿锛堜慨鏀规椂闂达級
--
Gitblit v1.8.0