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/webapp/views/common/sidebar.html |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/webapp/views/common/sidebar.html b/src/main/webapp/views/common/sidebar.html
index 29c5235..35ae2eb 100644
--- a/src/main/webapp/views/common/sidebar.html
+++ b/src/main/webapp/views/common/sidebar.html
@@ -325,8 +325,8 @@
                 <span translate="managementType.managementIssueType">�씪媛� �쑀�삎 愿�由�</span></a>
         </li>
 
-        <li class="sub-header" ng-if="$root.checkMngPermissionSettings()">
-            <span>LIST MANAGEMENT</span>
+        <li class="sub-header" ng-if="$root.checkMngPermission('USER_PERMISSION_MNG_PARTNER')">
+            <span>PARTNER LIST</span>
         </li>
         <li class="" ng-if="$root.checkMngPermission('USER_PERMISSION_MNG_PARTNER')">
             <a ui-sref="companyField.list" tabindex="-1">

--
Gitblit v1.8.0