Merge branch 'v3.5' of http://git.ycjcjy.com/zhiyuxing/estateagents into v3.5

src/main/resources/mapper/TaBuildingMapper.xml

@@ -105,8 +105,8 @@
                     </foreach>
                 </if>
                 <if test="name != null and name !=''">
-                    AND `name` LIKE CONCAT('%',#{name},'%')
-                    OR `building_name` LIKE CONCAT('%',#{name},'%')
+                    AND (`name` LIKE CONCAT('%',#{name},'%')
+                    OR `building_name` LIKE CONCAT('%',#{name},'%'))
                 </if>
             ) as tb