Merge branch 'test' into dev-lili-330

jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrSearchHistoryServiceImpl.java

@@ -63,9 +63,9 @@ public class OcrSearchHistoryServiceImpl extends ServiceImpl<OcrSearchHistoryMap
 
         //系统中记录的ai统计租户id
         String counttenantid = iCacheManager.get(CacheConstants.TOOLSCOUNT_TENANTID_MODEL_NAME,tenantid);
-        if(!StringUtils.isBlank(counttenantid)){
+//        if(!StringUtils.isBlank(counttenantid)){
-            return ResultVoUtil.error("true");
+//            return ResultVoUtil.error("true");
-        }
+//        }
 
         //用户登录信息写入缓存
         iCacheManager.put(CacheConstants.TOOLSCOUNT_TENANTID_MODEL_NAME,tenantid,"true",CacheConstants.TOOLSCOUNT_TENANTID_CACHE_TIME);

jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrTaskPackageServiceImpl.java

@@ -62,7 +62,7 @@ public class OcrTaskPackageServiceImpl extends ServiceImpl<OcrTaskPackageMapper,
         BeanUtil.copyProperties(ocrTaskPackage, taskPackage);
         taskPackage.setCheckDuplicateId(ocrCheckDuplicate.getId());
         if (this.save(taskPackage)) {
-            return ResultVoUtil.success("创建任务包成功!");
+            return ResultVoUtil.success("创建任务包成功！",taskPackage);
         }
         return ResultVoUtil.error("创建任务包失败!");
     }