Merge remote-tracking branch 'origin/master'

puzhibing

2024-12-26 8c83fad498da51773d4aa6a4aa6af13f8e39e27d

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

@@ -77,7 +77,7 @@
   
   
   
   @PostMapping("/getRefundPassSetting")
   @GetMapping("/getRefundPassSetting")
   @ApiOperation(value = "获取售后设置", tags = {"管理后台-售后管理"})
   public R<RefundPassSettingVo> getRefundPassSetting(){
      BaseSetting one = baseSettingService.getOne(new LambdaQueryWrapper<BaseSetting>().eq(BaseSetting::getId, 5));