Merge remote-tracking branch 'origin/master'

XiaoRuby

2023-09-24 20956b0f05f81ca47cf6c3e8f9b3b426e9cfd035

 inspect-server/src/main/java/com/yuanchu/mom/service/InspectionItemService.java

@@ -21,10 +21,10 @@

    /**
     * 新增按钮-->2、查询所有检验项目
     * @param finishInspectId
     * @param id
     * @return
     */
    List<InspectionItemDto> selectInspectionItem(Integer finishInspectId, Integer type);
    List<InspectionItemDto> selectInspectionItem(Integer id, Integer type);

    /**
     * 新增按钮-->2、检验项目-->失去焦点发起该请求
@@ -41,5 +41,15 @@
     * @param name
     * @return
     */
    List<Map<String, Object>> chooseDev(Integer technologyId, String father, String name);
    //List<Map<String, Object>> chooseDev(Integer technologyId, String father, String name);


    /**
     * 更改设备
     * @param id
     * @param type
     * @param devId
     */
    void updateDevByInsId(Integer id, Integer type, Integer devId);

}