Merge branch 'master' into groupmealweb

src/pages/device/productmanage/index.jsx

@@ -142,6 +142,7 @@ const bomtechnology = (props) => {
       更新
     </a>
     )
+    if (!record.isDefault) {
     arr.push(
       <Popconfirm
           type="primary"
@@ -157,7 +158,7 @@ const bomtechnology = (props) => {
         >
           <a href="#">删除</a>
       </Popconfirm>);
-
+    }
     return arr;
   }
   const columns = [