Merge remote-tracking branch 'origin/master'

rentaiming

2024-05-31 23e78efefd96d28f0c492348f3cb8a9e6cdcbbab

 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ICustomConfigService.java

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

import com.ruoyi.system.domain.pojo.CustomConfig;
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.system.domain.CustomConfig;

/**
 * <p>