From 42411e4a26461229c6bca6e89ca55e98a80f5a4e Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期四, 30 九月 2021 18:08:17 +0800
Subject: [PATCH] bug修改
---
fanli/src/main/java/com/yeshi/fanli/entity/bus/lable/MergeClass.java | 198 +++++++++++++++++++++----------------------------
1 files changed, 86 insertions(+), 112 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..8d2d010 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,112 +1,86 @@
-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;
-
-/**
- * 9k9缁勫悎绫�
- *
- * @author yj
- *
- * @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{
-
-
- /**
- *
- */
- 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")
- private String name;// 鍚嶇О
-
- @JoinColumn(name = "k_merge_cid")
- @org.yeshi.utils.mybatis.Column(name = "k_merge_cid")
- private String mergeCids; // 绯荤粺绫籭d(閫楀彿闅斿紑)
-
- @JoinColumn(name = "k_weight")
- @org.yeshi.utils.mybatis.Column(name = "k_weight")
- private Double weight; // 鏉冮噸
-
- @JoinColumn(name = "k_createtime")
- @org.yeshi.utils.mybatis.Column(name = "k_createtime")
- private Date createtime; // 鍒涘缓鏃堕棿
-
- @JoinColumn(name = "k_updatetime")
- @org.yeshi.utils.mybatis.Column(name = "k_updatetime")
- private Date updatetime; // 鏇存柊鏃堕棿锛堜慨鏀规椂闂达級
-
-
-
- public Long getId() {
- return id;
- }
-
- public void setId(Long id) {
- this.id = id;
- }
-
- public String getName() {
- return name;
- }
-
- public void setName(String name) {
- this.name = name;
- }
-
- public String getMergeCids() {
- return mergeCids;
- }
-
- public void setMergeCids(String mergeCids) {
- this.mergeCids = mergeCids;
- }
-
- public Double getWeight() {
- return weight;
- }
-
- public void setWeight(Double weight) {
- this.weight = weight;
- }
-
- public Date getCreatetime() {
- return createtime;
- }
-
- public void setCreatetime(Date createtime) {
- this.createtime = createtime;
- }
-
- public Date getUpdatetime() {
- return updatetime;
- }
-
- public void setUpdatetime(Date updatetime) {
- this.updatetime = updatetime;
- }
-
-}
+package com.yeshi.fanli.entity.bus.lable;
+
+import java.util.Date;
+
+import org.yeshi.utils.mybatis.Column;
+import org.yeshi.utils.mybatis.Table;
+
+/**
+ * 9k9缁勫悎绫�
+ *
+ * @author yj
+ *
+ * @date 2018骞�6鏈�27鏃�
+ */
+@Table("yeshi_ec_class_9k9")
+public class MergeClass {
+
+ @Column(name = "k_id")
+ private Long id;
+
+ @Column(name = "k_name")
+ private String name;// 鍚嶇О
+
+ @Column(name = "k_merge_cid")
+ private String mergeCids; // 绯荤粺绫籭d(閫楀彿闅斿紑)
+
+ @Column(name = "k_weight")
+ private Double weight; // 鏉冮噸
+
+ @Column(name = "k_createtime")
+ private Date createtime; // 鍒涘缓鏃堕棿
+
+ @Column(name = "k_updatetime")
+ private Date updatetime; // 鏇存柊鏃堕棿锛堜慨鏀规椂闂达級
+
+
+
+ public Long getId() {
+ return id;
+ }
+
+ public void setId(Long id) {
+ this.id = id;
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ public String getMergeCids() {
+ return mergeCids;
+ }
+
+ public void setMergeCids(String mergeCids) {
+ this.mergeCids = mergeCids;
+ }
+
+ public Double getWeight() {
+ return weight;
+ }
+
+ public void setWeight(Double weight) {
+ this.weight = weight;
+ }
+
+ public Date getCreatetime() {
+ return createtime;
+ }
+
+ public void setCreatetime(Date createtime) {
+ this.createtime = createtime;
+ }
+
+ public Date getUpdatetime() {
+ return updatetime;
+ }
+
+ public void setUpdatetime(Date updatetime) {
+ this.updatetime = updatetime;
+ }
+
+}
--
Gitblit v1.8.0