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/resources/mybatis/query-template/companyField-template.xml | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/src/main/resources/mybatis/query-template/companyField-template.xml b/src/main/resources/mybatis/query-template/companyField-template.xml
index 224bdf3..c40ca51 100644
--- a/src/main/resources/mybatis/query-template/companyField-template.xml
+++ b/src/main/resources/mybatis/query-template/companyField-template.xml
@@ -7,6 +7,7 @@
SELECT
cf.id as id,
cf.name as name,
+ cf.manager as manager,
cf.tel as tel,
cf.email as email,
cf.memo as memo
--
Gitblit v1.8.0