Merge remote-tracking branch 'origin/master'

puzhibing

2023-08-04 c5cb162b5cbdb589e97290fba3ac3e9241ec48d4

 cloud-server-management/src/main/java/com/dsh/course/mapper/StoreMapper.java

@@ -7,9 +7,7 @@
import org.apache.ibatis.annotations.Param;

import java.util.List;
import org.apache.ibatis.annotations.Param;

import java.util.List;
import java.util.Map;

/**
@@ -33,4 +31,12 @@
     * @return
     */
    List<Map<String, Object>> queryCity(@Param("provinceCode") String provinceCode, @Param("cityCode") String cityCode);

    List<Map<String, Object>> queryListOfpage(@Param("provinceCode") String provinceCode,
                                              @Param("cityCode")  String cityCode,
                                              @Param("cityManagerId")  Integer cityManagerId,
                                              @Param("storeName")  String storeName,
                                              @Param("page") Page<Map<String, Object>> page);


}