Merge remote-tracking branch 'origin/master'

phpcjl

2024-12-16 cb490e56ee7bccbc3b56d6964e9b68e5aa8ec475

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

@@ -34,7 +34,7 @@
    * @return
    */
   @ResponseBody
   @PostMapping("/getBaseSetting")
   @GetMapping("/getBaseSetting")
   @ApiOperation(value = "获取基础配置", tags = {"管理后台-基础配置"})
   public R<BaseSetting> getBaseSetting(@RequestParam("id") Integer id){
      BaseSetting baseSetting = baseSettingService.getById(id);