Merge remote-tracking branch 'origin/master'

lin

2024-04-02 a977cf7f73fabaf610c39ce744f8891ec5cf473c

Merge remote-tracking branch 'origin/master'

 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>