Merge remote-tracking branch 'origin/master'

Pu Zhibing

2025-03-18 f615ec5c9239327740948501627545f8e78e2a9e

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

@@ -408,6 +408,10 @@
        return R.ok();
    }

    public static void main(String[] args) {
        System.out.println("17780483325".substring(5));
    }


    @PutMapping("/freezingOrThawing")
    @ApiOperation(value = "门店管理-冻结/解冻门店", tags = {"管理后台-门店管理"})