Merge remote-tracking branch 'origin/master'

Pu Zhibing

2024-12-26 c6c22108a4ff51877607fd03fcf6ba1a37f5faeb

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

@@ -55,6 +55,6 @@
    * 编辑门店
    * @param shop
    */
   @PostMapping("/shop-balance-statement/updateShop")
   @PostMapping("/shop/updateShop")
   void updateShop(Shop shop);
}