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

Pu Zhibing

2025-01-24 4b1453e19306592f703aa794e238bd028f67d320

 cloud-server-account/src/main/java/com/dsh/account/service/impl/CityManagerServiceImpl.java

@@ -16,6 +16,6 @@
public class CityManagerServiceImpl extends ServiceImpl<CityManagerMapper, CityManager> implements ICityManagerService {
    @Override
    public List<CityManager> listAll() {
        return this.list();
        return this.baseMapper.selectList(null);
    }
}