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

935090232@qq.com

2022-02-17 bc4420f7a0ba1d243abcbea44b2203e2f6c6bc11

 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>