fix conflect

Helius

2021-11-17 792a502dd95cadccbef8121673e6b5059a2c3550

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

@@ -65,6 +65,9 @@
      create_time=#{payTime}
      where order_id=#{orderId}
   </update>
    <delete id="deleteByOrderId">
      delete from sys_order_flow where order_id=#{orderId}
   </delete>

    <select id="selectByOrderId" resultMap="SysOrderFlowMap">
      select a.*, b.order_no from sys_order_flow a