Merge remote-tracking branch 'origin/dev_ic_mp' into develop

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/AgencyServiceImpl.java

@@ -194,7 +194,7 @@ public class AgencyServiceImpl implements AgencyService {
                     Result<String> addAreaCodeResult = epmetCommonServiceOpenFeignClient.addAreaCode(addAreaCodeFormDTO);
                     if (!addAreaCodeResult.success() || StringUtils.isBlank(addAreaCodeResult.getData())) {
                         if (addAreaCodeResult.getCode() > 8000) {
-                            throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "自定义area_code异常" + addAreaCodeResult.getMsg());
+                            throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "自定义area_code异常"+addAreaCodeResult.getInternalMsg() , addAreaCodeResult.getMsg());
                         } else {
                             throw new RenException("自定义area_code异常" + addAreaCodeResult.getInternalMsg());
                         }