Merge branch 'ty_urgent' into api

Helius

2020-12-23 844e37605b65a2a3d95b466d663d91ac8584350c

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

@@ -1,6 +1,8 @@
package com.matrix.system.hive.dao;

import com.matrix.core.pojo.PaginationVO;
import com.matrix.system.app.dto.OrderListDto;
import com.matrix.system.app.vo.OrderDetailVo;
import com.matrix.system.hive.bean.SysOrder;
import org.apache.ibatis.annotations.Param;

@@ -35,4 +37,8 @@
   public void updateOrderTime(@Param("orderTime") Date orderTime, @Param("id") Long id);

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

   List<OrderDetailVo> selectApiOrderListInPage(@Param("record") OrderListDto orderListDto, @Param("pageVo") PaginationVO pageVo);

   int selectApiOrderListTotal(@Param("record") OrderListDto orderListDto);
}