Merge remote-tracking branch 'origin/master'

rentaiming

2024-05-23 7c63c8b10623fbf9171039f1039c30ebe50c6893

 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/CustomConfigMapper.java

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

import com.ruoyi.system.domain.pojo.CustomConfig;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruoyi.system.domain.CustomConfig;

/**
 * <p>