Merge branch 'springboot3.5_cs' into spring3.5

zhou zhou

2 天以前 1724f77c35022b643c28dd3e5547679a5edc2d49

 rsf-server/src/main/resources/mapper/manager/LocItemMapper.xml

@@ -22,7 +22,8 @@
                FROM
                    man_loc_item li
                        INNER JOIN man_loc l ON l.id = li.loc_id
                    WHERE l.use_status = #{type}
                    WHERE li.deleted = 0
                      AND l.use_status = #{type}
                    <if test="channel != null">
                        AND l.channel = #{channel}
                    </if>