Merge branch 'master' of http://gitlab.yiboshi.com/XuJun/yn-science-front

src/views/report/project/components/projectEdit.vue

@@ -589,9 +589,6 @@
       <!-- 设备费-试制设备预算明细表 -->
       <manufacture-edit :manufactureList.sync:="formData.manufactureList"></manufacture-edit>
 
-      <!-- 设备 -->
-      <device-edit :deviceList.sync="formData.deviceList" />
-
       <!-- 项目安排及阶段目标 -->
       <proj-stage-goals :stageGoals.sync="formData.stageGoals" />