Merge remote-tracking branch 'origin/master'

puzhibing

2023-03-14 997bf5ea58c2741b1862a1010bf5d60a32850c4f

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

@@ -16,4 +16,8 @@
     */
    List<Company> query(@Param("province") String province, @Param("city") String city,
                        @Param("code") String code);



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