From 1d87d61cb31912ae9f5856cbfe1d763b27156afe Mon Sep 17 00:00:00 2001
From: er <913652501@qq.com>
Date: Fri, 03 Apr 2020 09:41:48 +0800
Subject: [PATCH] Merge branch 'dev' of http://192.168.2.240:7070/r/kidgrow-microservices-platform into dev

---
 kidgrow-business/kidgrow-code-generator/src/main/resources/template/Mapper.xml.vm |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/kidgrow-business/kidgrow-code-generator/src/main/resources/template/Mapper.xml.vm b/kidgrow-business/kidgrow-code-generator/src/main/resources/template/Mapper.xml.vm
index 3ed6bd4..7bec783 100644
--- a/kidgrow-business/kidgrow-code-generator/src/main/resources/template/Mapper.xml.vm
+++ b/kidgrow-business/kidgrow-code-generator/src/main/resources/template/Mapper.xml.vm
@@ -11,7 +11,7 @@
     <sql id="where">
         <where>
             <!--查询条件自行添加-->
-            p.is_del=0
+            is_del=0
             #foreach($column in $columns)
             #if($column.columnName != $pk.columnName || $pk.extra != 'auto_increment')
             <if test="p.$column.attrname != null and p.$column.attrname !=''">
@@ -34,6 +34,7 @@
     <select id="findList" resultType="${package}.${moduleName}.model.${className}">
         select <include refid="Column_List"/>
         from ${tableName}
+        <include refid="where"/>
         order by id desc
     </select>
 </mapper>
\ No newline at end of file

--
Gitblit v1.8.0