diff --git a/pluss-manage-page/src/main/java/cn/pluss/platform/controller/activityActivate/ActivityActivateController.java b/pluss-manage-page/src/main/java/cn/pluss/platform/controller/activityActivate/ActivityActivateController.java
index 79b8f93..fd1b2f6 100644
--- a/pluss-manage-page/src/main/java/cn/pluss/platform/controller/activityActivate/ActivityActivateController.java
+++ b/pluss-manage-page/src/main/java/cn/pluss/platform/controller/activityActivate/ActivityActivateController.java
@@ -15,6 +15,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.servlet.ModelAndView;
 
 import javax.servlet.http.HttpServletRequest;
 import java.io.IOException;
@@ -187,6 +188,7 @@ public class ActivityActivateController extends BaseNoModelController {
 	@RequestMapping(value = "/saveActivityActivate", method = RequestMethod.POST)
 	@ResponseBody
 	public Map<String, Object> saveActivityActivate(ActivityActivate activityActivate) {
+
 		Map<String, Object> result = new HashMap<String, Object>(16);
 		// 通过merchantCode查商户信息
 		MerchantBaseInfo merchantBaseInfo = new MerchantBaseInfo();
diff --git a/pluss-manage-page/src/main/java/cn/pluss/platform/controller/deviceGoods/DeviceGoodsController.java b/pluss-manage-page/src/main/java/cn/pluss/platform/controller/deviceGoods/DeviceGoodsController.java
index 95a3a8f..195d197 100644
--- a/pluss-manage-page/src/main/java/cn/pluss/platform/controller/deviceGoods/DeviceGoodsController.java
+++ b/pluss-manage-page/src/main/java/cn/pluss/platform/controller/deviceGoods/DeviceGoodsController.java
@@ -6,9 +6,11 @@ import cn.pluss.platform.api.Result;
 import cn.pluss.platform.api.ResultGenerator;
 import cn.pluss.platform.base.BaseModelController;
 import cn.pluss.platform.device.DeviceGoodTagService;
+import cn.pluss.platform.device.DeviceSpecService;
 import cn.pluss.platform.device.DeviceTypeService;
 import cn.pluss.platform.entity.DeviceGoodTag;
 import cn.pluss.platform.entity.DeviceGoods;
+import cn.pluss.platform.entity.DeviceSpec;
 import cn.pluss.platform.entity.DeviceType;
 import cn.pluss.platform.util.OssOperatUtil;
 import com.alibaba.fastjson.JSONObject;
@@ -20,6 +22,7 @@ import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.servlet.ModelAndView;
 
+import javax.annotation.Resource;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
@@ -70,7 +73,8 @@ public class DeviceGoodsController extends BaseModelController<DeviceGoodsServic
 
         return data;
     }
-
+    @Resource
+    DeviceSpecService deviceSpecService;
     /**
      * 数据回显
      */
@@ -82,6 +86,9 @@ public class DeviceGoodsController extends BaseModelController<DeviceGoodsServic
         List<DeviceGoodTag> list = deviceGoodTagService.list();
         model.addAttribute("deviceGoodTagList", list);
 
+        List<DeviceSpec> list1 = deviceSpecService.list();
+        model.addAttribute("list1", list1);
+
         Map<String, String> uploadParam = OssOperatUtil.getUploadParam();
         model.addAttribute("uploadParam",uploadParam);
         if (id != null) {
diff --git a/pluss-manage-page/src/main/java/cn/pluss/platform/controller/home/HomeController.java b/pluss-manage-page/src/main/java/cn/pluss/platform/controller/home/HomeController.java
index 7b95dc8..b395d4d 100644
--- a/pluss-manage-page/src/main/java/cn/pluss/platform/controller/home/HomeController.java
+++ b/pluss-manage-page/src/main/java/cn/pluss/platform/controller/home/HomeController.java
@@ -3,7 +3,10 @@ package cn.pluss.platform.controller.home;
 import cn.pluss.platform.api.Result;
 import cn.pluss.platform.api.ResultGenerator;
 import cn.pluss.platform.controller.BaseNoModelController;
+import cn.pluss.platform.device.DeviceSpecService;
 import cn.pluss.platform.entitiy.ShiroUser;
+import cn.pluss.platform.entity.DeviceSpec;
+import cn.pluss.platform.entity.DeviceType;
 import cn.pluss.platform.entity.MerchantChannelStatus;
 import cn.pluss.platform.entity.PlatformData;
 import cn.pluss.platform.home.HomeService;
@@ -17,6 +20,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
@@ -166,7 +170,6 @@ public class HomeController extends BaseNoModelController {
         result.put("loginName", loginName);
         return result;
     }
-
     @PostMapping(value = "/getAuditData")
     @ResponseBody
     public Result<Object> getAuditData() {
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/deviceGoods/detail.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/deviceGoods/detail.jsp
index 00c1657..4d9d0ad 100644
--- a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/deviceGoods/detail.jsp
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/deviceGoods/detail.jsp
@@ -77,7 +77,28 @@
         </div>
     </div>
 
+<%--    <div class="layui-form-item">--%>
+<%--        <div class="layui-inline">--%>
+<%--            <label class="layui-form-label">规格选择:</label>--%>
+
+<%--            <div class="layui-input-inline">--%>
+<%--                <select lay-filter="typeSelect1" id="typeSelect1" class="layui-select" autocomplete="off">--%>
+<%--                    <option value="">请选择</option>--%>
+<%--                    <c:forEach items="${list1}" var="item">--%>
+<%--&lt;%&ndash;                        <option value="${dict.code}" ${dict.code == entity.code ? 'selected' : ''}>${dict.name}</option>&ndash;%&gt;--%>
+<%--                        <option value="${item.id}" ${item.id == entity.id ? 'selected' : ''}>${item.specName}</option>--%>
+<%--                    </c:forEach>--%>
+<%--                </select>--%>
+<%--            </div>--%>
+<%--            <div class="layui-form-mid layui-word-aux">--%>
+<%--                <span style="color: red">* 若需添加规格的商品，可以在编码和名称中自定义</span>--%>
+<%--            </div>--%>
+<%--        </div>--%>
+<%--    </div>--%>
+
+
     <div class="layui-form-item">
+
         <div class="layui-inline">
             <label class="layui-form-label">分类标签:</label>
             <div class="layui-input-inline">
@@ -328,6 +349,17 @@
             } else {
                 $("input[name = 'codeName']").val("");
             }
+        });
+        form.on("select(typeSelect1)", function(data) {
+            console.log("aaaaa");
+            console.log(data.othis);
+            console.log(data.value);
+            $("input[name = 'code']").val(data.value);
+            if (data.value != "") {
+                $("input[name = 'codeName']").val(data.elem[data.elem.selectedIndex].text);
+            } else {
+                $("input[name = 'codeName']").val("");
+            }
         })
     });