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

Helius

2021-06-25 4a0980a5d393f6b78961d221d45a1951eb1bd51e

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

@@ -6,7 +6,7 @@
        SELECT
               a.*,
               a.CREATED_TIME createTime,
               b.name name,
               b.nick_name name,
               b.mobile_phone phone,
               d.express_com expressCom,
               d.express_no expressNo
@@ -20,7 +20,7 @@
        </if>

        <if test="name != null and name != ''">
            and b.name like concat('%',#{name},'%')
            and b.nick_name like concat('%',#{name},'%')
        </if>
        <if test="status != null and status != ''">
            and a.status = #{status}