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

huanghongfa

2021-07-22 02f18587bd8860b305e2c688e20465be166bb48c

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComShopUserAddressServiceImpl.java

@@ -110,7 +110,8 @@
        if(userAddressDO == null){
            return R.fail("未查询到用户收货地址信息");
        }
        if(this.baseMapper.deleteById(addressId) > 0){
        userAddressDO.setDeleteStatus(1);
        if(this.baseMapper.updateById(userAddressDO) > 0){
            return R.ok();
        }else{
            return R.fail("删除收货地址失败");