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

Helius

2021-06-28 704f69c894146a959dc91890171e3f5ef30c9bc5

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

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

@@ -19,7 +19,7 @@
        FROM
        xzx_jhy_order a
        left join xzx_user_info b on b.user_id = a.user_id
        left join xzx_jhy_info d on d.id = a.jhy_id
        left join xzx_jhy_info d on d.user_id = a.jhy_id
        WHERE 1 = 1
        <if test="record.orderNo != null and record.orderNo != ''">
            and a.order_no like concat('%',#{record.orderNo},'%')
@@ -64,7 +64,7 @@
        FROM
        xzx_jhy_order a
        left join xzx_user_info b on b.user_id = a.user_id
        left join xzx_jhy_info d on d.id = a.jhy_id
        left join xzx_jhy_info d on d.user_id = a.jhy_id
        WHERE a.id=#{id}
    </select>