Merge branch 'score_shop' into api_score_meger

jyy

2022-01-23 c381ee31e4bc8c186878ac0178164f3604516783

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

@@ -66,7 +66,7 @@
      where order_id=#{orderId}
   </update>
    <delete id="deleteByOrderId">
      delete sys_order_flow where order_id=#{orderId}
      delete from sys_order_flow where order_id=#{orderId}
   </delete>

    <select id="selectByOrderId" resultMap="SysOrderFlowMap">