Merge branch 'score-shop' into xc-prd

Helius

2021-12-08 ef4ad171c46f615a5b719bac70c468b561bc08ac

 gc-shop/src/main/java/com/xzx/gc/shop/mapper/ScoreGoodsMapper.java

@@ -18,7 +18,9 @@

    ScoreGoods selectById(long id);

    List<QueryGoodsListVo> queryGoodsList(@Param("name")String name, @Param("delFlag")int delFlag);
    List<QueryGoodsListVo> queryGoodsList(@Param("name")String name, @Param("delFlag")int delFlag
            , @Param("isQg")int isQg, @Param("isSale")int isSale
            , @Param("namePx")int namePx, @Param("typePx")int typePx);

    List<XcxGoodsListVo> selectXcxGoodsList(@Param("record") XcxGoodsListDto xcxGoodsListDto);