Merge branch 'data_move' of http://120.27.238.55:7000/r/beauty-erp into dat...

wzy

2021-03-25 1b51c3e64ba8117900d594fcd5b677336e4759bc

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

@@ -37,7 +37,7 @@

   public int selectInPageCount(@Param("record") SysOrder sysOrder);

   public void updateOrderTime(@Param("orderTime") Date orderTime, @Param("id") Long id);
   public void updateOrderTime(@Param("payTime") Date orderTime, @Param("id") Long id);

   SysOrder selectVipOrderInfoTotal(@Param("vipId") Long vipId);