Merge remote-tracking branch 'origin/hive2.0' into hive2.0

935090232@qq.com

2021-02-20 5f377d1f45b85fba841794a93e67b03622613479

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