fix:解决合并冲突

jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/api/PrevailCloudApi.java

@@ -32,4 +32,5 @@ public interface PrevailCloudApi {
      * 图片下载监测
      */
     boolean startImageDownloadMonitoring(String localImagePath) throws Exception;
+
 }

jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/api/impl/PrevailCloudApiImpl.java

@@ -217,4 +217,5 @@ public class PrevailCloudApiImpl implements PrevailCloudApi {
         return true;
     }
     
+
 }