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

puzhibing

2024-06-14 5f37dc3fac7e65e19ea02303243c4fd107f5f5cb

 cloud-server-management/src/main/java/com/dsh/course/service/ICityService.java

@@ -2,6 +2,7 @@

import com.baomidou.mybatisplus.extension.service.IService;
import com.dsh.course.entity.City;
import com.dsh.guns.modular.system.model.TCity;

public interface ICityService extends IService<City> {
public interface ICityService extends IService<TCity> {
}