Merge remote-tracking branch 'origin/master'

lisy

2023-07-26 3c30fbe42c95bfc5a48768b26c3a3f8e38a7cfdc

 cloud-server-account/src/main/java/com/dsh/account/controller/CityController.java

@@ -44,6 +44,7 @@
        try {
            Page<TCityManager> page = new Page<>(listQuery.getOffset(), listQuery.getLimit());
            LambdaQueryWrapper<TCityManager> tCityManagerLambdaQueryWrapper = new LambdaQueryWrapper<>();
            tCityManagerLambdaQueryWrapper.ne(TCityManager::getState,3);
            if(ToolUtil.isNotEmpty(listQuery.getProvinceCode())){
                tCityManagerLambdaQueryWrapper.eq(TCityManager::getProvinceCode,listQuery.getProvinceCode());
            }