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

puzhibing

2024-03-15 889749753021d76463d85450bd95e6615886956e

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

@@ -85,6 +85,6 @@


    List<Map<String, Object>> listStoreAllByIds(List<Integer> ids);
    List<Map<String, Object>> querySiteListOfpage(String provinceCode, String cityCode, Integer operatorId, String storeName);
    List<Map<String, Object>> querySiteListOfpage(String provinceCode, String cityCode, Integer operatorId, String storeName,Integer storeId);

}