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

xiaoyong931011

2021-06-28 9745739b71a6f1f4b8baa5a6f703747d2814c332

 gc-shop/src/main/resources/mapper/shop/ScoreGoodsCategoryMapper.xml

@@ -25,7 +25,7 @@
        xzx_score_goods_category a
        WHERE 1 = 1
        <if test="record.name != null and record.name != ''">
            and a.name=#{record.name}
            and a.name like concat('%',#{record.name},'%')
        </if>
        <if test="record.categoryIden != null and record.categoryIden != ''">
            and a.category_iden=#{record.categoryIden}