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

lidongdong

2022-11-10 38596b03540250dd7de85c49f53ece5dd6bfe5b7

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComShopFlowerGoodsDAO.java

@@ -3,10 +3,11 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.panzhihua.common.model.dtos.shop.*;
import com.panzhihua.common.model.dtos.shop.ComShopFlowerGoodsDTO;
import com.panzhihua.common.model.dtos.shop.PageComShopFlowerGoodsDTO;
import com.panzhihua.common.model.dtos.shop.PageComShopFlowerStoreDTO;
import com.panzhihua.common.model.vos.shop.ComShopFlowerGoodsVO;
import com.panzhihua.common.model.vos.shop.ComShopGoodsVO;
import com.panzhihua.common.model.vos.shop.PageShopGoodsVO;
import com.panzhihua.common.model.vos.shop.PageShopFlowerGoodsVO;
import com.panzhihua.service_community.model.dos.ComShopFlowerGoodsDO;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
@@ -19,7 +20,7 @@
@Mapper
public interface ComShopFlowerGoodsDAO extends BaseMapper<ComShopFlowerGoodsDO> {

    IPage<ComShopFlowerGoodsVO> pageShopGoods(@Param("page") Page page, @Param("pageComShopFlowerGoodsDTO") PageComShopFlowerGoodsDTO pageComShopFlowerGoodsDTO);
    IPage<PageShopFlowerGoodsVO> pageShopGoods(@Param("page") Page page, @Param("pageComShopFlowerGoodsDTO") PageComShopFlowerGoodsDTO pageComShopFlowerGoodsDTO);

    /**
     * 根据店铺id查询商品列表