Merge branch 'master-alipay-change' into dev

xx-vehicle/xx-vehicle-server/src/main/resources/mapper/BranchCompanyMapper.xml

@@ -31,7 +31,7 @@
         from branch_company
         <where>
             <if test="addrCity != null">
-                and addr_city = #{addrCity}
+                and (addr_city = #{addrCity} or addr_province = #{addrCity} or addr_town = #{addrCity})
             </if>
             <if test="lon != null and lat != null">
                 and longitude is not null and latitude is not null