Merge remote-tracking branch 'origin/master'

jhjang

2021-11-15 b31979feb926bad9e0070332fb5ed7a896fd378d

 src/main/webapp/i18n/ko/global.json

@@ -767,7 +767,10 @@
        "departmentName": "부서명",
        "departmentEx": "부서설명",
        "departmentCount": "부서인원",
        "departmentUser": "부서 팀원"
        "departmentUser": "부서 팀원",
        "detectingInfo": "탐지정보",
        "detectingData": "탐지일시",
        "import": "가져오기"
    },
    "tasks": {
        "agileBoardTitle": "칸반 보드"
@@ -798,12 +801,14 @@
        "successToApiTokenAdd" : "API 토큰 생성 성공"
    },
    "companyField" : {
        "info": "업체 정보",
        "add" : "업체 생성",
        "name" : "업체 이름",
        "company" : "업체 분류",
        "profitYN" : "영리/비영리",
        "industry" : "산업 분류",
        "domain" : "도메인",
        "ipAdress" : "ip주소",
        "manager" : "담당자",
        "tel" : "전화번호",
        "code" : "코드",
@@ -819,6 +824,7 @@
        "invalidTelFormat": "전화번호 형식이 맞지 않습니다. xxx-xxx-xxxx 형식으로 입력하세요."
    },
    "ispField" : {
        "info": "ISP 정보",
        "add" : "ISP 생성",
        "name" : "ISP 이름",
        "manager" : "담당자",
@@ -836,6 +842,7 @@
        "invalidCodeFormat": "코드명에는 특수 문자를 입력 할 수 없습니다."
    },
    "hostingField" : {
        "info": "호스팅 정보",
        "add" : "호스팅 생성",
        "name" : "호스팅 이름",
        "manager" : "담당자",