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

935090232@qq.com

2021-11-21 b4fa5c2efd4f78f2623f4302509b12c98a73b339

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

@@ -271,6 +271,9 @@
         <if test="record.shopId != null ">
            shop_id  = #{record.shopId},
         </if>
         <if test="record.companyId != null ">
            company_id  = #{record.companyId},
         </if>
      </set>
      WHERE id=#{record.id}
   </update>