Merge branch 'score_shop' into api_score_meger

935090232@qq.com

2021-10-29 835f6562bd7a83fd156c0bc8b9e48b3e6fe3f5ee

 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>