Merge remote-tracking branch 'origin/score_shop' into score_shop

jyy

2021-03-15 53939e0ceb528f45c4906c86ce499ecb864f7af8

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