Merge remote-tracking branch 'origin/dev' into dev_

jinpengyong

2022-01-20 2ab1de34b119570c99946ab3e480e9d31745518a

 screen-api/src/main/java/com/moral/api/service/SupervisionService.java

@@ -26,6 +26,6 @@
    //修改督办单
    Map<String, Object> updateSupervision(MultipartFile[] files, Supervision supervision);

    void deleteSupervision(Integer id);
    void deleteSupervision(Integer supervisionId);

}