From 2fa74aa3dbbf6e526a6809a89aaf3a43a7722a26 Mon Sep 17 00:00:00 2001
From: clunt <clunt@vip.163.com>
Date: Thu, 19 May 2022 16:51:34 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A1=A5=E5=85=85=E7=83=AD=E9=97=A8=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/ghy/goods/domain/DeptGoodsCategory.java    | 3 +++
 .../main/resources/mapper/goods/DeptGoodsCategoryMapper.xml  | 5 +++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/ghy-goods/src/main/java/com/ghy/goods/domain/DeptGoodsCategory.java b/ghy-goods/src/main/java/com/ghy/goods/domain/DeptGoodsCategory.java
index 024dd8c1..9e64d543 100644
--- a/ghy-goods/src/main/java/com/ghy/goods/domain/DeptGoodsCategory.java
+++ b/ghy-goods/src/main/java/com/ghy/goods/domain/DeptGoodsCategory.java
@@ -20,6 +20,9 @@ public class DeptGoodsCategory extends GoodsCategory {
     @Excel(name = "分公司id", cellType = Excel.ColumnType.NUMERIC)
     private Long deptId;
 
+    @Excel(name = "是否热门类目 0.不是,1.是", cellType = Excel.ColumnType.NUMERIC)
+    private Integer isHot;
+
     @Excel(name = "一级分销扣点比例", cellType = Excel.ColumnType.STRING)
     private String oneRate;
 
diff --git a/ghy-goods/src/main/resources/mapper/goods/DeptGoodsCategoryMapper.xml b/ghy-goods/src/main/resources/mapper/goods/DeptGoodsCategoryMapper.xml
index bb078d86..6a38c53e 100644
--- a/ghy-goods/src/main/resources/mapper/goods/DeptGoodsCategoryMapper.xml
+++ b/ghy-goods/src/main/resources/mapper/goods/DeptGoodsCategoryMapper.xml
@@ -12,6 +12,7 @@
         <result property="status"                   column="status"     />
         <result property="type"                     column="type"     />
         <result property="categorySort"             column="category_sort"/>
+        <result property="isHot"                    column="is_hot"/>
         <result property="oneRate"                  column="one_rate"/>
         <result property="twoRate"                  column="two_rate"/>
         <result property="threeRate"                column="three_rate"/>
@@ -23,7 +24,7 @@
     </resultMap>
 
     <sql id="selectDeptGoodsCategory">
-        SELECT dept_goods_category_id, dept_id, goods_category_id, category_sort,
+        SELECT dept_goods_category_id, dept_id, goods_category_id, category_sort, is_hot,
                one_rate, two_rate, three_rate, create_by, create_time, remark
         FROM dept_goods_category
     </sql>
@@ -31,7 +32,7 @@
     <sql id="selectJoin">
         SELECT dgc.dept_goods_category_id, dgc.dept_id, dgc.goods_category_id, dgc.category_sort,
                dgc.one_rate, dgc.two_rate, dgc.three_rate, dgc.create_by, dgc.create_time, dgc.remark,
-               gc.goods_category_name, gc.level, gc.parent_category_id, gc.type, gc.status
+               gc.goods_category_name, dgc.is_hot, gc.level, gc.parent_category_id, gc.type, gc.status
         FROM dept_goods_category dgc LEFT JOIN goods_category gc ON dgc.goods_category_id = gc.goods_category_id
     </sql>