Merge branch 'master_tiande_company' into dev-tiande

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

@@ -40,7 +40,7 @@
                 and (c.addr_city = #{addrCity} or c.addr_province = #{addrCity} or c.addr_town = #{addrCity})
             </if>
             <if test="addrProvince != null">
-                and  c.addr_province = #{addrCity}
+                and  c.addr_province = #{addrProvince}
             </if>
             <if test="lon != null and lat != null">
                 and c.longitude is not null and c.latitude is not null