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

Helius

2021-08-09 00a8e2f76d02cfc17ca9ff156aa97f85bae5897d

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

@@ -8,6 +8,7 @@
        a.CREATED_TIME createTime
        FROM
        xzx_score_goods a

        WHERE 1 = 1
        <if test="name != null and name != ''">
            and (a.name like concat('%',#{name},'%') or a.goods_no like concat('%',#{name},'%'))
@@ -47,7 +48,7 @@
        <where>
            a.del_flag=0 and a.is_sale=1
            <if test="record.minScore != null" >
                and b.present_price >= #{minScore}
                and b.present_price >= #{record.minScore}
            </if>
            <if test="record.maxScore != null">
                and #{record.maxScore} > b.present_price