Merge branch 'ty_urgent' into test

Helius

2020-12-19 a9bb3348487c4a75c6a74a4d84f3a8afe9858d0c

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

@@ -34,4 +34,5 @@

   public void updateOrderTime(@Param("orderTime") Date orderTime, @Param("id") Long id);
   
   SysOrder selectVipOrderInfoTotal(@Param("vipId") Long vipId);
}