Merge remote-tracking branch 'remotes/origin/dev_voice' into dev

epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/ScanContentUtils.java

@@ -45,7 +45,7 @@ public class ScanContentUtils {
 			return resultResult;
 		} catch (Exception e) {
 			log.debug("imgSyncScan param:{}", JSON.toJSONString(param));
-			return new Result<SyncScanResult>().error(EpmetErrorCode.SERVER_ERROR.getCode(), e.getMessage());
+			throw new RenException(EpmetErrorCode.SERVER_ERROR.getCode(), e.getMessage()));
 		}
 	}
 
@@ -72,7 +72,7 @@ public class ScanContentUtils {
 			return resultResult;
 		} catch (Exception e) {
 			log.error("textSyncScan exception:", e);
-			return new Result<SyncScanResult>().error(EpmetErrorCode.SERVER_ERROR.getCode(), e.getMessage());
+			throw new RenException(EpmetErrorCode.SERVER_ERROR.getCode(), e.getMessage());
 		}
 	}