Merge remote-tracking branch 'origin/dev_New_pro' into dev_New_pro

zss

2026-04-23 5033c375a3ee6a63bcb600d5b9f4b8d549d089e2

 src/main/java/com/ruoyi/project/system/controller/SysConfigController.java

@@ -1,18 +1,5 @@
package com.ruoyi.project.system.controller;



import java.util.List;

import javax.servlet.http.HttpServletResponse;

import org.springframework.beans.factory.annotation.Autowired;

import org.springframework.security.access.prepost.PreAuthorize;

import org.springframework.validation.annotation.Validated;

import org.springframework.web.bind.annotation.DeleteMapping;

import org.springframework.web.bind.annotation.GetMapping;

import org.springframework.web.bind.annotation.PathVariable;

import org.springframework.web.bind.annotation.PostMapping;

import org.springframework.web.bind.annotation.PutMapping;

import org.springframework.web.bind.annotation.RequestBody;

import org.springframework.web.bind.annotation.RequestMapping;

import org.springframework.web.bind.annotation.RestController;

import com.ruoyi.common.utils.poi.ExcelUtil;

import com.ruoyi.framework.aspectj.lang.annotation.Log;

import com.ruoyi.framework.aspectj.lang.enums.BusinessType;

@@ -21,6 +8,13 @@
import com.ruoyi.framework.web.page.TableDataInfo;

import com.ruoyi.project.system.domain.SysConfig;

import com.ruoyi.project.system.service.ISysConfigService;

import jakarta.servlet.http.HttpServletResponse;

import lombok.AllArgsConstructor;

import org.springframework.security.access.prepost.PreAuthorize;

import org.springframework.validation.annotation.Validated;

import org.springframework.web.bind.annotation.*;



import java.util.List;



/**

 * 参数配置 信息操作处理

@@ -29,9 +23,9 @@
 */

@RestController

@RequestMapping("/system/config")

@AllArgsConstructor

public class SysConfigController extends BaseController

{

    @Autowired

    private ISysConfigService configService;



    /**