Merge branch 'test' of https://gitee.com/jyyforjava/zq-erp into test

Helius

2020-12-27 3eb52981c3e97af186174d7eacbcb7ec0c5f8739

 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);
}