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

puzhibing

2024-03-11 334fbd5f1a5a4e85c198560bd024211ba4cf99b1

 cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/StoreServiceImpl.java

@@ -50,6 +50,10 @@
     * @return
     */
    @Override
    public List<Map<String, Object>> queryCity2(String provinceCode, String cityCode,Integer type,Integer operatorId) {
        return this.baseMapper.queryCity2(provinceCode, cityCode,type,operatorId);
    }
    @Override
    public List<Map<String, Object>> queryCity(String provinceCode, String cityCode) {
        return this.baseMapper.queryCity(provinceCode, cityCode);
    }