From 32f8ab2806fb088335e24983477f5179064ada9d Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 29 十一月 2019 17:37:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/entity/brand/BrandInfo.java | 13 ++++++++++++-
1 files changed, 12 insertions(+), 1 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/entity/brand/BrandInfo.java b/fanli/src/main/java/com/yeshi/fanli/entity/brand/BrandInfo.java
index 1a6801b..be8ad07 100644
--- a/fanli/src/main/java/com/yeshi/fanli/entity/brand/BrandInfo.java
+++ b/fanli/src/main/java/com/yeshi/fanli/entity/brand/BrandInfo.java
@@ -59,7 +59,10 @@
private Integer shopTotal; // 鎷ユ湁鍟嗗搧鏁伴噺
@Column(name = "bf_weight")
- private Double weight; // 鏉冮噸锛氬�艰秺澶ц秺鍓�
+ private Double weight; // 鎺掑簭锛氬�艰秺澶ц秺鍓�
+
+ @Column(name = "bf_order")
+ private Integer order;// 鎺掑簭锛氬�艰秺灏忚秺鍓�
@Column(name = "bf_state")
private Integer state;// 鐘舵�侊細0鍋滅敤 1鍚敤
@@ -204,4 +207,12 @@
public void setShopTotal(Integer shopTotal) {
this.shopTotal = shopTotal;
}
+
+ public Integer getOrder() {
+ return order;
+ }
+
+ public void setOrder(Integer order) {
+ this.order = order;
+ }
}
\ No newline at end of file
--
Gitblit v1.8.0