From 9f8f9d13c42ca8cdccbf351069082a5fdccef2e4 Mon Sep 17 00:00:00 2001
From: lin <sbla5888@163.com>
Date: Mon, 25 Mar 2024 17:30:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/place/mapper/PlaceMapper.xml | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/main/java/org/springblade/modules/place/mapper/PlaceMapper.xml b/src/main/java/org/springblade/modules/place/mapper/PlaceMapper.xml
index e2d80b1..fbff911 100644
--- a/src/main/java/org/springblade/modules/place/mapper/PlaceMapper.xml
+++ b/src/main/java/org/springblade/modules/place/mapper/PlaceMapper.xml
@@ -266,7 +266,7 @@
<otherwise>
and
(
- jg.grid_code in ('') or jpag.community_code in in ('')
+ jg.grid_code in ('') or jpag.community_code in ('')
)
</otherwise>
</choose>
@@ -344,6 +344,7 @@
jp.is_front,
jp.front_type,
jp.remark,
+ jp.three_fire_protection,
bu.real_name as username,bu.phone as phone,
jppl.id as plid,
jppl.place_id,
@@ -643,7 +644,7 @@
<otherwise>
and
(
- jg.grid_code in ('') or jpag.community_code in in ('')
+ jg.grid_code in ('') or jpag.community_code in ('')
)
</otherwise>
</choose>
--
Gitblit v1.9.3