Merge remote-tracking branch 'origin/master'

puzhibing

2024-12-26 8c83fad498da51773d4aa6a4aa6af13f8e39e27d

 ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/ShopController.java

@@ -300,5 +300,14 @@
        return R.ok(shopStatistics);
    }

    
    /**
     * 编辑门店
     * @param shop
     */
    @PostMapping("/updateShop")
    public void updateShop(@RequestBody Shop shop){
        shopService.updateById(shop);
    }
}