Merge remote-tracking branch 'origin/master'

puzhibing

2024-12-06 5ad4fb34ee60e2d90d0cdb1d974ca0f4a2f26d95

 ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/feignClient/ShopClient.java

@@ -23,4 +23,13 @@
    */
   @PostMapping("/shop/getShopById")
   R<Shop> getShopById(@RequestParam("id") Integer id);
	
	
   /**
    * 根据店铺管理员电话获取门店数据
    * @param phone
    * @return
    */
   @PostMapping("/shop/getShopByPhone")
   R<Shop> getShopByPhone(@RequestParam("phone") String phone);
}