From 5fb1952ae91f1a739803247266e87dbd15ea1f27 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 수, 01 12월 2021 13:23:09 +0900
Subject: [PATCH] 충돌 수정
---
src/main/java/kr/wisestone/owl/constant/MsgConstants.java | 5 +++++
1 files changed, 5 insertions(+), 0 deletions(-)
diff --git a/src/main/java/kr/wisestone/owl/constant/MsgConstants.java b/src/main/java/kr/wisestone/owl/constant/MsgConstants.java
index b4d81c6..4aff444 100644
--- a/src/main/java/kr/wisestone/owl/constant/MsgConstants.java
+++ b/src/main/java/kr/wisestone/owl/constant/MsgConstants.java
@@ -150,6 +150,7 @@
public static final String USER_NOT_EQUAL_PASSWORD = "USER_NOT_EQUAL_PASSWORD"; // 鍮꾨�踰덊샇媛� 留욎� �븡�뒿�땲�떎.
public static final String USER_NOT_EXIST = "USER_NOT_EXIST"; // �궗�슜�옄媛� 議댁옱�븯吏� �븡�뒿�땲�떎.
public static final String USER_NOT_AUTHORIZED = "USER_NOT_AUTHORIZED"; // �궗�슜�옄 �씤利� 沅뚰븳�씠 �뾾�뒿�땲�떎.
+ public static final String ERROR_TOKEN = "USER_NOT_AUTHORIZED_TOKEN"; // �쑀�슚�븯吏� �븡�� �넗�겙�엯�땲�떎.
public static final String USER_EXPIRED_PASSWORD = "USER_EXPIRED_PASSWORD"; // 鍮꾨�踰덊샇媛� 留뚮즺�릺�뿀�뒿�땲�떎.
public static final String USER_RETURN_PASSWORD_NOT_PROVIDER_SOCIAL_JOIN_USER = "USER_RETURN_PASSWORD_NOT_PROVIDER_SOCIAL_JOIN_USER"; // 鍮꾨�踰덊샇 李얘린 湲곕뒫�쓣 �냼�뀥 怨꾩젙 媛��엯 �궗�슜�옄�뒗 �궗�슜�븷 �닔 �뾾�뒿�땲�떎.
public static final String USER_NOT_USE_ACTIVE_STATUS = "USER_NOT_USE_ACTIVE_STATUS"; // �궗�슜�옄�뒗 �솢�꽦 �긽�깭媛� �븘�땲硫� 濡쒓렇�씤�븷 �닔 �뾾�뒿�땲�떎.
@@ -227,4 +228,8 @@
public static final String ISP_NOT_EXIST = "ISP_NOT_EXIST"; // ISP媛� 議댁옱�븯吏� �븡�뒿�땲�떎.
public static final String ISP_REMOVE_NOT_SELECT = "ISP_REMOVE_NOT_SELECT"; // �궘�젣�븷 ISP媛� �꽑�깮�릺吏� �븡�븯�뒿�땲�떎.
public static final String PROJECT_NOT_INCLUDE_DEPARTMENT = "PROJECT_NOT_INCLUDE_DEPARTMENT"; // �꽑�깮�븳 遺��꽌 以� �봽濡쒖젥�듃�뿉 李몄뿬�븯怨� �엳吏� �븡�� 遺��꽌媛� �엳�뒿�땲�떎.
+
+ public static final String API_PARAMETER_ISSUE_TYPE_ERROR = "API_PARAMETER_ISSUE_TYPE_ERROR"; // api �뙆�씪誘명꽣 �삤瑜�(�씠�뒋���엯)
+ public static final String API_PARAMETER_PROJECT_ERROR = "API_PARAMETER_PROJECT_ERROR"; // api �뙆�씪誘명꽣 �삤瑜�(�봽濡쒖젥�듃)
+ public static final String API_USER_ERROR = "API_USER_ERROR"; // api �궗�슜�옄 �삤瑜�
}
--
Gitblit v1.8.0