fix conflect

wzy

2021-11-11 8f7460c6ddff45ec39bf2026d75a3f4e2b26f13d

 zq-erp/src/main/java/com/matrix/system/hive/dao/SysOrderFlowDao.java

@@ -21,4 +21,7 @@
    Integer selectTotal(@Param("record")OrderFlowListDto orderFlowListDto);

    Integer updateTimeByOrderId(@Param("orderId") Long orderId, @Param("payTime") Date payTime);

    Integer deleteByOrderId(@Param("orderId") Long orderId);

}