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

Pu Zhibing

2025-03-19 e064c1165e0f7047e0a0d564569cd7c418009e67

 cloud-server-management/src/main/java/com/dsh/course/mapper/CityMapper.java

@@ -2,8 +2,9 @@

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.dsh.course.entity.City;
import com.dsh.guns.modular.system.model.TCity;
import org.apache.ibatis.annotations.Mapper;

@Mapper
public interface CityMapper extends BaseMapper<City> {
public interface CityMapper extends BaseMapper<TCity> {
}