From 271ae63c20fcbe28d29c47f1881138ff6551a2a1 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 10 六月 2020 19:26:26 +0800
Subject: [PATCH] 唯品会订单bug修复，APP端佣金比例展示错误bug修复
---
fanli/src/main/java/com/yeshi/fanli/entity/brand/BrandClass.java | 75 ++++++++++++++++++++++++++++++++-----
1 files changed, 65 insertions(+), 10 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/entity/brand/BrandClass.java b/fanli/src/main/java/com/yeshi/fanli/entity/brand/BrandClass.java
index 4acd9a6..4399083 100644
--- a/fanli/src/main/java/com/yeshi/fanli/entity/brand/BrandClass.java
+++ b/fanli/src/main/java/com/yeshi/fanli/entity/brand/BrandClass.java
@@ -1,7 +1,12 @@
package com.yeshi.fanli.entity.brand;
+import java.io.Serializable;
import java.util.Date;
+import org.yeshi.utils.mybatis.Column;
+import org.yeshi.utils.mybatis.Table;
+
+import com.google.gson.annotations.Expose;
import com.yeshi.fanli.entity.bus.clazz.GoodsClass;
/**
@@ -10,15 +15,49 @@
* @author Administrator
*
*/
-public class BrandClass {
+@Table("yeshi_ec_brand_class")
+public class BrandClass implements Serializable{
+ /**
+ *
+ */
+ private static final long serialVersionUID = 1L;
+
+ @Expose
+ @Column(name = "bc_id")
private Long id;
+
+ @Expose
+ @Column(name = "bc_name")
private String name;// 鍒嗙被鍚嶇О
+
+ @Column(name = "bc_gclass_id")
private GoodsClass goodsClass;// 瀵瑰簲鐨勪竴绾у垎绫�
- private Boolean show;
+
+ @Column(name = "bc_state")
+ private Integer state;
+
+ @Column(name = "bc_orderby")
private Integer orderBy;// 鎺掑簭鍊硷紝瓒婂皬瓒婇潬鍓�
+
+ @Column(name = "bc_create_time")
private Date createTime;
+
+ @Column(name = "bc_update_time")
private Date updateTime;
+ private Long gcid;
+ private String gcName;
+
+
+ public BrandClass() {}
+
+
+ public BrandClass(Long id) {
+ this.id = id;
+ }
+
+
+
public Long getId() {
return id;
}
@@ -43,14 +82,6 @@
this.goodsClass = goodsClass;
}
- public Boolean getShow() {
- return show;
- }
-
- public void setShow(Boolean show) {
- this.show = show;
- }
-
public Integer getOrderBy() {
return orderBy;
}
@@ -74,4 +105,28 @@
public void setUpdateTime(Date updateTime) {
this.updateTime = updateTime;
}
+
+ public Integer getState() {
+ return state;
+ }
+
+ public void setState(Integer state) {
+ this.state = state;
+ }
+
+ public Long getGcid() {
+ return gcid;
+ }
+
+ public void setGcid(Long gcid) {
+ this.gcid = gcid;
+ }
+
+ public String getGcName() {
+ return gcName;
+ }
+
+ public void setGcName(String gcName) {
+ this.gcName = gcName;
+ }
}
--
Gitblit v1.8.0