Merge remote-tracking branch 'origin/master'

liujie

2023-10-25 3530f728388d91b09a62fbd8f82d3a56b1ff265b

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

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

    List<Map<String, Object>> queryListOfpage(@Param("provinceCode") String provinceCode,
                                              @Param("cityCode")  String cityCode,
@@ -72,4 +73,7 @@
    JsDto get(Integer id);

    List<SelectDto> getSelect();

    List<TStoreListVo> listAllStore(@Param("page") Page<TStoreListVo> page, @Param("provinceCode") String provinceCode, @Param("cityCode") String cityCode, @Param("name") String name, @Param("phone") String phone, @Param("shopName") String shopName, @Param("id") Integer id);

}