Merge remote-tracking branch 'origin/master'

rain

2026-01-29 7941db00ace2a95cf5d65b51d7ad600c225b2eda

 drone-service/drone-system/src/main/java/org/sxkj/system/mapper/RegionMapper.xml

@@ -164,7 +164,7 @@
                and code like concat(concat('%', #{param2.cityCode}),'%')
            </if>
            <if test="param2.districtName!=null and param2.districtName!=''">
                and district_name like concat(concat('%', #{param2.districtName}),'%')
                and name like concat(concat('%', #{param2.districtName}),'%')
            </if>
            <if test="param2.parentName!=null and param2.parentName!=''">
                and (