Merge remote-tracking branch 'origin/master'

rentaiming

2024-05-23 7c63c8b10623fbf9171039f1039c30ebe50c6893

 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/CustomConfigServiceImpl.java

@@ -1,9 +1,9 @@
package com.ruoyi.system.service.impl;

import com.ruoyi.system.domain.pojo.CustomConfig;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.system.domain.CustomConfig;
import com.ruoyi.system.mapper.CustomConfigMapper;
import com.ruoyi.system.service.ICustomConfigService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;

/**