From 6a72a3edec87cca9996c7ab3be3fd48479881945 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 목, 02 12월 2021 21:55:28 +0900
Subject: [PATCH] 충돌 수정
---
src/main/java/kr/wisestone/owl/web/controller/HostingFieldController.java | 12 ++++++++++++
1 files changed, 12 insertions(+), 0 deletions(-)
diff --git a/src/main/java/kr/wisestone/owl/web/controller/HostingFieldController.java b/src/main/java/kr/wisestone/owl/web/controller/HostingFieldController.java
index b903c38..51f8a3b 100644
--- a/src/main/java/kr/wisestone/owl/web/controller/HostingFieldController.java
+++ b/src/main/java/kr/wisestone/owl/web/controller/HostingFieldController.java
@@ -1,6 +1,7 @@
package kr.wisestone.owl.web.controller;
import kr.wisestone.owl.constant.Constants;
+import kr.wisestone.owl.constant.UsePartner;
import kr.wisestone.owl.service.HostingFieldService;
import kr.wisestone.owl.web.condition.HostingFieldCondition;
import kr.wisestone.owl.web.form.HostingFieldForm;
@@ -86,6 +87,17 @@
return this.setSuccessMessage(resJsonData);
}
+ // �뾽泥�/ISP/�샇�뒪�똿 紐⑸줉 媛��졇�삤湲�
+ @RequestMapping(value = "/company/getPartnerList", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE)
+ public
+ @ResponseBody
+ Map<String, Object> getPartnerList(@RequestBody Map<String, Map<String, Object>> params) {
+ Map<String, Object> resJsonData = new HashMap<>();
+ resJsonData.put(Constants.REQ_KEY_CONTENT, UsePartner.getPartnerList());
+
+ return this.setSuccessMessage(resJsonData);
+ }
+
// �뾽泥� �뿊�� �떎�슫濡쒕뱶
@RequestMapping(value = "/hostingField/downloadExcel", method = RequestMethod.POST)
--
Gitblit v1.8.0