Merge branch 'ty_urgent' into test

wzy

2020-12-26 b026000678b45d14970bca3b8052e377072f4af2

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

@@ -33,5 +33,6 @@
   public int selectInPageCount(@Param("record") SysOrder sysOrder);

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

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