merge developer

Helius

2022-03-03 e213e39be2f626ce052abb5bd1582d48059177ba

 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>