Merge branch 'score_shop' into api_score_meger

Helius

2022-01-04 342f8a021166f82a973d3cd3fc03841df502d26a

 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>