Merge remote-tracking branch 'origin/master'

liujie

2023-10-25 3530f728388d91b09a62fbd8f82d3a56b1ff265b

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

@@ -38,6 +38,7 @@
     * @return
     */
    List<Map<String, Object>> queryCity(String provinceCode, String cityCode);
    List<Map<String, Object>> queryCity1();

    List<Map<String, Object>> queryListOfpage(String provinceCode, String cityCode, Integer operatorId, String storeName, Page<Map<String, Object>> page);

@@ -76,7 +77,6 @@
    List<SelectDto> getSelect();

    List<TStoreListVo> listAllStore(Page<TStoreListVo> page, String provinceCode, String cityCode, String name, String phone, String shopName, Integer objectId);



}