Merge branch 'api' into hive2.0

jyy

2021-01-25 949efdc17fa833f6511c0e5902057f3be0fe72c4

 zq-erp/src/main/resources/mybatis/mapper/hive/SysOrderFlowDao.xml

@@ -37,7 +37,9 @@
      vip_id,
      pay_method,
      card_id,
      is_gift
      is_gift,
      shop_id,
      company_id
      )
      VALUES (
      #{id},
@@ -53,7 +55,9 @@
      #{vipId},
      #{payMethod},
      #{cardId},
      #{isGift}
      #{isGift},
      #{shopId},
      #{companyId}
      )
   </insert>