Merge remote-tracking branch 'origin/score_shop' into score_shop

jyy

2021-04-06 12990a5138e3fa8874a601bfb784a2b1147f0f24

 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">