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

puzhibing

2024-06-14 5f37dc3fac7e65e19ea02303243c4fd107f5f5cb

 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);
    }
}