Merge branch 'score-shop' of http://120.27.238.55:7000/r/xzx into score-shop

xiaoyong931011

2021-11-19 c50f2002f8e47fae55b628caa244904018477cb7

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