From 12ee57fe168d76d8a71993a1473dba8b20d49ab9 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 월, 29 11월 2021 09:43:53 +0900
Subject: [PATCH] 이슈(추가,수정)충돌 수정
---
src/main/resources/mybatis/query-template/IspField-template.xml | 5 +++--
1 files changed, 3 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 0ebdced..98c25b5 100644
--- a/src/main/resources/mybatis/query-template/IspField-template.xml
+++ b/src/main/resources/mybatis/query-template/IspField-template.xml
@@ -6,13 +6,14 @@
<select id="find" resultType="java.util.HashMap" parameterType="kr.wisestone.owl.web.condition.IspFieldCondition">
SELECT
i.id as id,
+ i.code as code,
i.name as name,
i.manager as manager,
i.tel as tel,
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},'%')
@@ -29,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