diff --git a/ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/service/ICcdiCustFmyRelationService.java b/ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/service/ICcdiCustFmyRelationService.java index 0e611fb..ef1b5f3 100644 --- a/ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/service/ICcdiCustFmyRelationService.java +++ b/ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/service/ICcdiCustFmyRelationService.java @@ -90,5 +90,5 @@ public interface ICcdiCustFmyRelationService { * @param taskId 任务ID * @return 失败记录列表 */ - List getImportFailures(String taskId); + List getImportFailures(String taskId); } diff --git a/ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/service/ICcdiIntermediaryService.java b/ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/service/ICcdiIntermediaryService.java index 80c6bd2..9bffa4f 100644 --- a/ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/service/ICcdiIntermediaryService.java +++ b/ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/service/ICcdiIntermediaryService.java @@ -103,7 +103,7 @@ public interface ICcdiIntermediaryService { * @param list Excel实体列表 * @return 结果 */ - String importIntermediaryPerson(java.util.List list); + String importIntermediaryPerson(java.util.List list); /** * 导入实体中介数据 @@ -111,5 +111,5 @@ public interface ICcdiIntermediaryService { * @param list Excel实体列表 * @return 结果 */ - String importIntermediaryEntity(java.util.List list); + String importIntermediaryEntity(java.util.List list); } diff --git a/ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/service/impl/CcdiCustFmyRelationServiceImpl.java b/ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/service/impl/CcdiCustFmyRelationServiceImpl.java index 1679406..d0c2d5d 100644 --- a/ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/service/impl/CcdiCustFmyRelationServiceImpl.java +++ b/ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/service/impl/CcdiCustFmyRelationServiceImpl.java @@ -140,7 +140,7 @@ public class CcdiCustFmyRelationServiceImpl implements ICcdiCustFmyRelationServi } @Override - public List getImportFailures(String taskId) { + public List getImportFailures(String taskId) { return importService.getImportFailures(taskId); } diff --git a/ruoyi-ui/vue.config.js b/ruoyi-ui/vue.config.js index abe18e1..b8f77cd 100644 --- a/ruoyi-ui/vue.config.js +++ b/ruoyi-ui/vue.config.js @@ -36,8 +36,8 @@ module.exports = { proxy: { // detail: https://cli.vuejs.org/config/#devserver-proxy [process.env.VUE_APP_BASE_API]: { - // target: baseUrl, - target: "http://116.62.17.81:20202", + target: baseUrl, + // target: "http://116.62.17.81:20202", changeOrigin: true, pathRewrite: { ['^' + process.env.VUE_APP_BASE_API]: ''