Merge branch 'score_shop' of http://120.27.238.55:7000/r/beauty-erp into sc...

xiaoyong931011

2021-04-06 162fd6cf9cc47858c29d0b488bd7f018b77a56b4

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