Merge branch 'score_shop' into api_score_meger

jyy

2021-09-25 4f4fd43c199ff802df896256bc012a7277fdd4a1

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

@@ -23,4 +23,5 @@
    Integer updateTimeByOrderId(@Param("orderId") Long orderId, @Param("payTime") Date payTime);

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

}