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

huanghongfa

2021-09-02 177249c76aeea0b4bf8d8816d4994e3b445b45ce

 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);

}