Merge remote-tracking branch 'origin/score_shop' into score_shop

jyy

2021-07-09 8287f743a1ac2fd5330f6dd7ca08255df193ae03

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

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