Merge remote-tracking branch 'origin/master'

mitao

2024-06-05 d36bb8b4ea60d1bb0d46bbc0c5dbc02aca86afcd

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

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

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

/**
 * <p>