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/IspField-template.xml | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/main/resources/mybatis/query-template/IspField-template.xml b/src/main/resources/mybatis/query-template/IspField-template.xml
index 7d08a4e..98c25b5 100644
--- a/src/main/resources/mybatis/query-template/IspField-template.xml
+++ b/src/main/resources/mybatis/query-template/IspField-template.xml
@@ -13,7 +13,7 @@
i.email as email,
i.memo as memo
FROM
- isp i
+ isp_field i
WHERE 1=1
<if test="name != '' and name != null">
AND i.name like CONCAT('%',#{name},'%')
@@ -30,7 +30,7 @@
SELECT
count(i.id)
FROM
- isp i
+ isp_field i
WHERE 1=1
<if test="name != '' and name != null">
AND i.name like CONCAT('%',#{name},'%')
--
Gitblit v1.8.0