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

puzhibing

2024-06-14 5f37dc3fac7e65e19ea02303243c4fd107f5f5cb

 cloud-server-other/src/main/java/com/dsh/other/mapper/TImgConfigMapper.java

@@ -1,7 +1,8 @@
package com.dsh.other.mapper;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.dsh.other.entity.TImgConfig;
import com.baomidou.mybatisplus.mapper.BaseMapper;


/**
 * <p>