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

puzhibing

2024-03-11 aa8afb8f18fee21361742b62061b4d4db4a09bb5

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

@@ -39,6 +39,8 @@
     */
    List<Map<String, Object>> queryCity(String provinceCode, String cityCode);
    List<Map<String, Object>> queryCity1();
    List<Map<String, Object>> queryCity2(String provinceCode, String cityCode,
                                         Integer type,Integer operatorId);

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