Merge remote-tracking branch 'origin/2.0' into 2.0

zhibing.pu

2024-05-06 0045a8fdf5525a385c233c3b82e42f6120021cac

 UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/CompanyMapper.java

@@ -14,5 +14,8 @@
     * @param code
     * @return
     */
    List<Company> query(@Param("province") String province, @Param("city") String city, @Param("code") String code);
    Company query(@Param("cityIds") List<Integer> cityIds);


    List<Company> queryList(@Param("city") String[] city, @Param("type") Integer type);
}