diff --git a/ghy-admin/src/main/resources/templates/goods/deptcategory/deptcategory.html b/ghy-admin/src/main/resources/templates/goods/deptcategory/deptcategory.html
index f43bd9ad..f7a7044a 100644
--- a/ghy-admin/src/main/resources/templates/goods/deptcategory/deptcategory.html
+++ b/ghy-admin/src/main/resources/templates/goods/deptcategory/deptcategory.html
@@ -87,11 +87,38 @@
                     title: '三级分销扣点',
                     align: "left"
                 },
-                // {
-                //     field: 'categorySort',
-                //     title: '排序',
-                //     align: "left"
-                // },
+                {
+                    field: 'deptRate',
+                    title: '平台扣点比例',
+                    align: "left"
+                },
+                {
+                    field: 'deptMoney',
+                    title: '平台固定扣金额',
+                    align: "left"
+                },
+                {
+                    field: 'retainRate',
+                    title: '截留扣点',
+                    align: "left"
+                },
+                {
+                    field: 'retainMoney',
+                    title: '截留金额',
+                    align: "left"
+                },
+                {
+                    field: 'isHot',
+                    title: '是否热门类目',
+                    align: "left",
+                    formatter: function (value) {
+                        if (value === 1){
+                            return "是";
+                        }else {
+                            return "否";
+                        }
+                    }
+                },
                 {
                     field: 'status',
                     title: '状态',
diff --git a/ghy-admin/src/main/resources/templates/goods/deptcategory/edit.html b/ghy-admin/src/main/resources/templates/goods/deptcategory/edit.html
index 31513980..139f5fcc 100644
--- a/ghy-admin/src/main/resources/templates/goods/deptcategory/edit.html
+++ b/ghy-admin/src/main/resources/templates/goods/deptcategory/edit.html
@@ -11,13 +11,13 @@
 <div class="main-content">
     <form class="form-horizontal" id="form-deptGoodsCategory-edit" th:object="${deptGoodsCategory}">
         <input id="deptGoodsCategoryId" name="deptGoodsCategoryId" type="hidden" th:field="*{deptGoodsCategoryId}"/>
-        <h4 class="form-header h4">基本信息</h4>
+
         <div class="row">
             <div class="col-sm-6">
                 <div class="form-group">
-                    <label class="col-sm-4 control-label is-required">类目名称：</label>
-                    <div class="col-sm-8">
-                        <input name="goodsCategoryName" placeholder="请输入商品名称" class="form-control" type="text" maxlength="30"
+                    <label class="col-sm-6 control-label is-required">类目名称：</label>
+                    <div class="col-sm-6">
+                        <input name="goodsCategoryName" placeholder="请输入类目名称" class="form-control" type="text" maxlength="30"
                                th:field="*{goodsCategoryName}"
                                disabled>
                     </div>
@@ -25,8 +25,8 @@
             </div>
             <div class="col-sm-6">
                 <div class="form-group">
-                    <label class="col-sm-4 control-label is-required">一级分销扣点比例：</label>
-                    <div class="col-sm-8">
+                    <label class="col-sm-6 control-label is-required">一级分销扣点比例：</label>
+                    <div class="col-sm-6">
                         <input name="oneRate" placeholder="请输入一级分销扣点比例" class="form-control" type="text" maxlength="12"
                                th:field="*{oneRate}"
                                required>
@@ -34,11 +34,12 @@
                 </div>
             </div>
         </div>
+
         <div class="row">
             <div class="col-sm-6">
                 <div class="form-group">
-                    <label class="col-sm-4 control-label is-required">二级分销扣点比例：</label>
-                    <div class="col-sm-8">
+                    <label class="col-sm-6 control-label is-required">二级分销扣点比例：</label>
+                    <div class="col-sm-6">
                         <input name="twoRate" placeholder="请输入二级分销扣点比例" class="form-control" type="text"
                                th:field="*{twoRate}"
                                maxlength="12" required>
@@ -47,8 +48,8 @@
             </div>
             <div class="col-sm-6">
                 <div class="form-group">
-                    <label class="col-sm-4 control-label is-required">三级分销扣点比例：</label>
-                    <div class="col-sm-8">
+                    <label class="col-sm-6 control-label is-required">三级分销扣点比例：</label>
+                    <div class="col-sm-6">
                         <input name="threeRate" placeholder="请输入三级分销扣点比例" class="form-control" type="text" maxlength="12"
                                th:field="*{threeRate}"
                                required>
@@ -57,12 +58,68 @@
             </div>
         </div>
 
-        <h4 class="form-header h4">其他信息</h4>
         <div class="row">
-            <div class="col-sm-12">
+            <div class="col-sm-6">
                 <div class="form-group">
-                    <label class="col-xs-2 control-label">备注：</label>
-                    <div class="col-xs-10">
+                    <label class="col-sm-6 control-label is-required">平台扣点比例：</label>
+                    <div class="col-sm-6">
+                        <input name="deptRate" placeholder="请输入平台扣点比例" class="form-control" type="text"
+                               th:field="*{deptRate}"
+                               maxlength="12" required>
+                    </div>
+                </div>
+            </div>
+            <div class="col-sm-6">
+                <div class="form-group">
+                    <label class="col-sm-6 control-label is-required">平台固定扣金额：</label>
+                    <div class="col-sm-6">
+                        <input name="deptMoney" placeholder="请输入平台固定扣金额" class="form-control" type="text" maxlength="12"
+                               th:field="*{deptMoney}"
+                               required>
+                    </div>
+                </div>
+            </div>
+        </div>
+
+        <div class="row">
+            <div class="col-sm-6">
+                <div class="form-group">
+                    <label class="col-sm-6 control-label is-required">截留扣点：</label>
+                    <div class="col-sm-6">
+                        <input name="retainRate" placeholder="请输入截留扣点" class="form-control" type="text"
+                               th:field="*{retainRate}"
+                               maxlength="12" required>
+                    </div>
+                </div>
+            </div>
+            <div class="col-sm-6">
+                <div class="form-group">
+                    <label class="col-sm-6 control-label is-required">截留金额：</label>
+                    <div class="col-sm-6">
+                        <input name="retainMoney" placeholder="请输入截留金额" class="form-control" type="text" maxlength="12"
+                               th:field="*{retainMoney}"
+                               required>
+                    </div>
+                </div>
+            </div>
+        </div>
+
+        <div class="row">
+            <div class="col-sm-6">
+                <div class="form-group">
+                    <label class="col-sm-6 control-label">是否热门类目：</label>
+                    <div class="col-sm-6">
+                        <select name="isHot" class="form-control m-b" th:with="type=${@dict.getType('sys_user_sex')}">
+                            <option th:text="是" th:value="1"/>
+                            <option th:text="否" th:value="0"/>
+                        </select>
+                    </div>
+                </div>
+            </div>
+            <div class="col-sm-6">
+                <div class="form-group">
+                    <label class="col-sm-3 control-label">备注：</label>
+                    <div class="col-sm-9">
                         <textarea name="remark" maxlength="500" class="form-control" rows="3"
                                   th:field="*{remark}"></textarea>
                     </div>
diff --git a/ghy-goods/src/main/resources/mapper/goods/DeptGoodsCategoryMapper.xml b/ghy-goods/src/main/resources/mapper/goods/DeptGoodsCategoryMapper.xml
index 662991fd..bce024de 100644
--- a/ghy-goods/src/main/resources/mapper/goods/DeptGoodsCategoryMapper.xml
+++ b/ghy-goods/src/main/resources/mapper/goods/DeptGoodsCategoryMapper.xml
@@ -16,10 +16,10 @@
         <result property="oneRate"                  column="one_rate"/>
         <result property="twoRate"                  column="two_rate"/>
         <result property="threeRate"                column="three_rate"/>
-        <result property="deptRate"                column="dept_rate"/>
+        <result property="deptRate"                 column="dept_rate"/>
         <result property="deptMoney"                column="dept_money"/>
-        <result property="retainRate"                column="retain_rate"/>
-        <result property="retainMoney"                column="retain_money"/>
+        <result property="retainRate"               column="retain_rate"/>
+        <result property="retainMoney"              column="retain_money"/>
         <result property="createBy"                 column="create_by"/>
         <result property="createTime"               column="create_time"/>
         <result property="updateBy"                 column="update_by"/>
@@ -36,8 +36,8 @@
     <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, dgc.is_hot, gc.level, gc.parent_category_id, gc.type, gc.status,
-               dgc.dept_rate, dgc.dept_money, dgc.retain_rate, dgc.retain_money
+               dgc.is_hot, dgc.dept_rate, dgc.dept_money, dgc.retain_rate, dgc.retain_money,
+               gc.goods_category_name, 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>
 
@@ -58,6 +58,11 @@
     <update id="updateDeptGoodsCategory" parameterType="com.ghy.goods.domain.DeptGoodsCategory">
         UPDATE dept_goods_category
         <set>
+            <if test="isHot != null">is_hot = #{isHot},</if>
+            <if test="deptRate != null and deptRate != ''">dept_rate = #{deptRate},</if>
+            <if test="deptMoney != null and deptMoney != ''">dept_money = #{deptMoney},</if>
+            <if test="retainRate != null and retainRate != ''">retain_rate = #{retainRate},</if>
+            <if test="retainMoney != null and retainMoney != ''">retain_money = #{retainMoney},</if>
             <if test="categorySort != null">category_sort = #{categorySort},</if>
             <if test="oneRate != null and oneRate != ''">one_rate = #{oneRate},</if>
             <if test="twoRate != null and twoRate != ''">two_rate = #{twoRate},</if>
@@ -83,6 +88,11 @@
     <insert id="insertDeptGoodsCategory" parameterType="com.ghy.goods.domain.DeptGoodsCategory" useGeneratedKeys="true"
     keyProperty="goodsCategoryId">
         insert into dept_goods_category(
+        <if test="isHot != null and isHot != ''">is_hot,</if>
+        <if test="deptRate != null and deptRate != ''">dept_rate,</if>
+        <if test="deptMoney != null and deptMoney != ''">dept_money,</if>
+        <if test="retainRate != null and retainRate != ''">retain_rate,</if>
+        <if test="retainMoney != null and retainMoney != ''">retain_money,</if>
         <if test="deptId != null and deptId != ''">dept_id,</if>
         <if test="goodsCategoryId != null">goods_category_id,</if>
         <if test="categorySort != null">category_sort,</if>
@@ -92,6 +102,11 @@
         <if test="createBy != null and createBy != ''">create_by,</if>
         create_time
         )values(
+        <if test="isHot != null and isHot != ''">#{isHot},</if>
+        <if test="deptRate != null and deptRate != ''">#{deptRate},</if>
+        <if test="deptMoney != null and deptMoney != ''">#{deptMoney},</if>
+        <if test="retainRate != null and retainRate != ''">#{retainRate},</if>
+        <if test="retainMoney != null and retainMoney != ''">#{retainMoney},</if>
         <if test="deptId != null and deptId != ''">#{deptId},</if>
         <if test="goodsCategoryId != null">#{goodsCategoryId},</if>
         <if test="categorySort != null">#{categorySort},</if>