From a977cf7f73fabaf610c39ce744f8891ec5cf473c Mon Sep 17 00:00:00 2001
From: lin <sbla5888@163.com>
Date: Tue, 02 Apr 2024 10:46:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/grid/mapper/GridMapper.xml | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/src/main/java/org/springblade/modules/grid/mapper/GridMapper.xml b/src/main/java/org/springblade/modules/grid/mapper/GridMapper.xml
index ce07dc3..95a243c 100644
--- a/src/main/java/org/springblade/modules/grid/mapper/GridMapper.xml
+++ b/src/main/java/org/springblade/modules/grid/mapper/GridMapper.xml
@@ -88,6 +88,7 @@
<select id="getGridDetailByParam" resultType="org.springblade.modules.grid.vo.GridVO">
SELECT
jg.id,
+ jg.grid_code,
jg.grid_name,
br.name as community_name,
jg.sort,
@@ -110,7 +111,7 @@
<!--自定义详情查询-->
<select id="getGridDetail" resultType="org.springblade.modules.grid.vo.GridVO">
- select id,community_code,grid_name,principal,principal_phone,remark,sort from jczz_grid
+ select id,grid_code,community_code,grid_name,principal,principal_phone,remark,sort from jczz_grid
where is_deleted = 0 and id = #{grid.id}
</select>
--
Gitblit v1.9.3