Merge remote-tracking branch 'origin/master'

zhibing.pu

2024-09-07 4fd0278cda787a91eb35d95d6491f5485afe3e48

 ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/TAppUserAddressController.java

@@ -70,10 +70,10 @@
        TAppUserAddress appUserAddress = appUserAddressService.getOne(Wrappers.<TAppUserAddress>lambdaQuery().eq(TAppUserAddress::getAppUserId, userId)
                .eq(TAppUserAddress::getDefaultAddress, 1));
        if(Objects.isNull(appUserAddress)){
            return AjaxResult.ok(new TAppUserAddress());
            return AjaxResult.success();
        }
        appUserAddress.setUid(appUserAddress.getId().toString());
        return AjaxResult.ok(appUserAddress);
        return AjaxResult.success(appUserAddress);
    }