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

Helius

2021-06-29 2a53d6814b43d58d3b8b373fe2690f68e2e912a8

 gc-order/src/main/resources/mapper/order/JhyOrderMapper.xml

@@ -22,11 +22,11 @@
        left join xzx_jhy_info c on a.jhy_id=c.user_id
        <where>
            <if test="record.type == 1">
                and user_id=#{record.userId}
                and a.user_id=#{record.userId}
            </if>
            <if test="record.type == 2">
                <if test="record.status != 1">
                    and jhy_id=#{record.userId}
                    and a.jhy_id=#{record.userId}
                </if>
            </if>
            <if test="record.status != null and record.status != ''">