Merge remote-tracking branch 'remotes/origin/dev_resi_export' into develop

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserExportServiceImpl.java

@@ -236,9 +236,9 @@ public class IcResiUserExportServiceImpl implements IcResiUserExportService {
         param.setTempId(templateId);
         param.setExportConfig(exportConfig);
         Result<IcCustomExportResultDTO> exportConfigResult = operCustomizeOpenFeignClient.getExcelHeaderAndSqlColumnForExport(param);
-        if (!exportConfigResult.success() ) {
-            log.error("获取模板失败,internalMsg:{},msg:{}" , exportConfigResult.getInternalMsg(), exportConfigResult.getMsg());
-            throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "获取模板失败" + exportConfigResult.getInternalMsg(),"获取模板失败" + exportConfigResult.getInternalMsg());
+        if (!exportConfigResult.success()) {
+            log.error("获取模板失败,internalMsg:{},msg:{}", exportConfigResult.getInternalMsg(), exportConfigResult.getMsg());
+            throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), exportConfigResult.getInternalMsg(), exportConfigResult.getInternalMsg());
         }
         IcCustomExportResultDTO data = exportConfigResult.getData();