Merge remote-tracking branch 'origin/master'

luodangjia

2024-12-16 1d64c14b6b0e9bbcae2736f83c0a498b5083d1d6

 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);
   
   /**
    * 根据店铺管理员电话获取门店数据