diff --git a/ghy-admin/src/main/java/com/ghy/web/controller/goods/GoodsController.java b/ghy-admin/src/main/java/com/ghy/web/controller/goods/GoodsController.java
index e6a4c379..f45d6d48 100644
--- a/ghy-admin/src/main/java/com/ghy/web/controller/goods/GoodsController.java
+++ b/ghy-admin/src/main/java/com/ghy/web/controller/goods/GoodsController.java
@@ -164,6 +164,10 @@ public class GoodsController extends BaseController {
     @PostMapping("/app/list")
     @ResponseBody
     public TableDataInfo appList(@RequestBody Goods goods) {
+        Integer type=goods.getType();
+        if (type==null){
+            goods.setType(1);
+        }
         // 判断类目id是否为第三级，不是的话需要找到所有符合条件的第三级类目id作为新的条件
         if (goods.getDeptGoodsCategoryId() != null) {
             logger.info("入参：" + goods.getDeptGoodsCategoryId());
diff --git a/ghy-goods/src/main/java/com/ghy/goods/domain/Goods.java b/ghy-goods/src/main/java/com/ghy/goods/domain/Goods.java
index cbb61aac..45cd4f4a 100644
--- a/ghy-goods/src/main/java/com/ghy/goods/domain/Goods.java
+++ b/ghy-goods/src/main/java/com/ghy/goods/domain/Goods.java
@@ -90,6 +90,8 @@ public class Goods extends BaseEntity {
 
     private String keyword;
 
+    /*类型：服务商品  1和 配件商品 2*/
+    private Integer type;
 
     private List<InsuranceManager> insuranceManagers;
 }
diff --git a/ghy-goods/src/main/resources/mapper/goods/GoodsMapper.xml b/ghy-goods/src/main/resources/mapper/goods/GoodsMapper.xml
index 775676c9..57748544 100644
--- a/ghy-goods/src/main/resources/mapper/goods/GoodsMapper.xml
+++ b/ghy-goods/src/main/resources/mapper/goods/GoodsMapper.xml
@@ -20,12 +20,13 @@
         <result property="goodsVideoUrl"       column="goods_video_url"/>
         <result property="status"              column="status"/>
         <result property="createBy"            column="create_by"     />
-        <result property="createTime"          column="create_time"   />
+        <result property="createTime"          column="create_time"   />        
         <result property="updateBy"            column="update_by"     />
         <result property="updateTime"          column="update_time"   />
         <result property="remark"              column="remark"        />
         <result property="areaDesc"              column="area_desc"        />
         <result property="keyword"             column="keyword"        />
+        <result property="type"             column="type"        />
     </resultMap>
 
     <sql id="selectGoods">
@@ -58,6 +59,7 @@
             <if test="expectDuration != null and expectDuration!=''">expect_duration = #{expectDuration},</if>
             <if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
             <if test="areaDesc != null and areaDesc != ''">area_desc = #{areaDesc},</if>
+            <if test="type != null">type = #{type},</if>
             update_time = sysdate()
         </set>
         WHERE goods_id = #{goodsId}
@@ -88,6 +90,7 @@
         <if test="remark != null and remark != ''">remark,</if>
         <if test="areaDesc != null and areaDesc != ''">area_desc,</if>
         <if test="createBy != null and createBy != ''">create_by,</if>
+        <if test="type != null">type,</if>
         create_time
         )values(
         <if test="goodsCode != null and goodsCode != ''">#{goodsCode},</if>
@@ -107,6 +110,7 @@
         <if test="remark != null and remark != ''">#{remark},</if>
         <if test="areaDesc != null and areaDesc != ''">#{areaDesc},</if>
         <if test="createBy != null and createBy != ''">#{createBy},</if>
+        <if test="type != null">#{type},</if>
         sysdate()
         )
     </insert>
@@ -149,6 +153,9 @@
             <if test="workerId != null">
                 AND worker_id = #{workerId}
             </if>
+            <if test="type != null">
+                AND g.type = #{type}
+            </if>
             <if test="goodsId != null">
                 AND g.goods_id = #{goodsId}
             </if>