conflect fix

Helius

2021-06-11 289b0503bc197d196997142f60b3a8ef8b70f0cc

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

@@ -60,8 +60,16 @@
      #{companyId}
      )
   </insert>
   <update id="updateTimeByOrderId">
      UPDATE sys_order_flow set
      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 id="selectByOrderId" resultMap="SysOrderFlowMap">
      select a.*, b.order_no from sys_order_flow a
      left join sys_order b on a.order_id=b.id
      where order_id=#{orderId}
@@ -125,8 +133,11 @@
         <if test="record.shopId != null and record.shopId != ''">
            and a.shop_id=#{record.shopId}
         </if>

      </where>
      <if test="record.sort !=null">
         order by
         a.${record.sort} ${record.order}
      </if>
      <if test="record.offset >=0  and record.limit >0">
         limit
         #{record.offset},#{record.limit}