Merge branch 'score_shop' into api_score_meger

jyy

2021-07-14 a2d8b47677fcf9eff87faff1bb89a8674714ddd7

 zq-erp/src/main/resources/mybatis/mapper/xcxShop/ShopDeliveryInfoDao.xml

@@ -241,8 +241,8 @@
         <if test="record.orderId != null ">
            order_id  = #{record.orderId},
         </if>
         <if test="record.receive_id != null ">
            receive_id  = #{record.receive_id},
         <if test="record.receiveId != null ">
            receive_id  = #{record.receiveId},
         </if>
         <if test="record.userId != null and record.userId != '' ">
            user_id  = #{record.userId},