From 717deb35e2654e41a9679fccc2e7409927a58912 Mon Sep 17 00:00:00 2001
From: DESKTOP-71BH0QO\L、ming <172680469@qq.com>
Date: 星期日, 25 四月 2021 15:33:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComShopUserAddressDAO.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComShopUserAddressDAO.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComShopUserAddressDAO.java
index 7462399..8aaeeae 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComShopUserAddressDAO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComShopUserAddressDAO.java
@@ -20,7 +20,7 @@
 
     @Select("select id,`name`,phone,province_code,province_name,city_code,city_name" +
             ",district_code,district_name,detail_address,is_default " +
-            " from com_shop_user_address where user_id = #{userId} order by create_at desc")
+            " from com_shop_user_address where delete_status = 2 and user_id = #{userId} order by create_at desc")
     List<ComShopUserAddressVO> pageUserAddressList(Page page, @Param("userId") Long userId);
 
 }

--
Gitblit v1.7.1