From 4b1453e19306592f703aa794e238bd028f67d320 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期五, 24 一月 2025 16:20:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0' into 2.0

---
 cloud-server-management/src/main/java/com/dsh/course/mapper/CityMapper.java |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/cloud-server-management/src/main/java/com/dsh/course/mapper/CityMapper.java b/cloud-server-management/src/main/java/com/dsh/course/mapper/CityMapper.java
index 0bd44d9..44c909d 100644
--- a/cloud-server-management/src/main/java/com/dsh/course/mapper/CityMapper.java
+++ b/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> {
 }

--
Gitblit v1.7.1