修改冲突

sfd

2025-05-13 feddd20a4323e49ef9f424d07e53c12e715203fc

 aps-modules/aps-job/src/main/java/com/aps/job/service/IApsWorkOrderJobLogService.java

@@ -58,4 +58,6 @@
     * @return 结果
     */
    public int deleteApsWorkOrderJobLogById(Long id);

    boolean retryRequestWorkOrderByLogId(Long id);
}