Merge remote-tracking branch 'origin/master'

puzhibing

2023-05-18 53562814add61acfdc02d6b25dae6324f6fd5f92

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

@@ -14,7 +14,7 @@
     * @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);