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

xiaoyong931011

2021-11-10 b0c195d4628b9086fb6e3f16759d15cf49100a50

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

@@ -45,10 +45,10 @@
            a.is_sale
        </if>
        <if test="namePx != null and namePx != '' and namePx == 4">
            a.present_price
            a.present_price + 0
        </if>
        <if test="namePx != null and namePx != '' and namePx == 5">
            a.original_price
            a.original_price + 0
        </if>
        <if test="namePx != null and namePx != '' and namePx == 6">
            stock