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

puzhibing

2024-05-06 7c26ec693561ecce9fba31ab4e83e9f30d641aad

 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);
}