Merge remote-tracking branch 'origin/master'

puzhibing

2024-12-19 17e2f65826b3b69871e45c88238e5c7317f7ecb7

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

@@ -29,7 +29,9 @@
    */
   @PostMapping("/shop/getShopById")
   R<Shop> getShopById(@RequestParam("id") Integer id);
	

   @PostMapping("/shop/getShopByUserId")
   R<List<Shop>> getShopByUserId(@RequestParam("id") Long id);
   
   /**
    * 根据店铺管理员电话获取门店数据