From eda58e0e6d4abdd2b060e28867d103045845aa69 Mon Sep 17 00:00:00 2001
From: 罗元桥 <2376770955@qq.com>
Date: 星期一, 30 八月 2021 13:13:18 +0800
Subject: [PATCH] Merge branch 'test' into 'yuyue_dev'
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComShopUserAddressDAO.java | 17 +++++++++--------
1 files changed, 9 insertions(+), 8 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 8aaeeae..b5772a0 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
@@ -1,14 +1,15 @@
package com.panzhihua.service_community.dao;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.panzhihua.common.model.vos.shop.ComShopUserAddressVO;
-import com.panzhihua.service_community.model.dos.ComShopUserAddressDO;
+import java.util.List;
+
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
-import java.util.List;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.panzhihua.common.model.vos.shop.ComShopUserAddressVO;
+import com.panzhihua.service_community.model.dos.ComShopUserAddressDO;
/**
* @auther lyq
@@ -18,9 +19,9 @@
@Mapper
public interface ComShopUserAddressDAO extends BaseMapper<ComShopUserAddressDO> {
- @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 delete_status = 2 and user_id = #{userId} order by create_at desc")
+ @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 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