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

935090232@qq.com

2022-02-17 bc4420f7a0ba1d243abcbea44b2203e2f6c6bc11

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

@@ -9,6 +9,7 @@
import com.matrix.system.shopXcx.api.vo.ErpOrderDetailVo;
import org.apache.ibatis.annotations.Param;

import java.math.BigDecimal;
import java.util.Date;
import java.util.List;

@@ -54,4 +55,6 @@
   List<ErpOrderDetailVo> selectErpOrderList(ErpOrderListDto erpOrderListDto);

   ErpOrderDetailVo findUserOrderById(Long orderId);

   BigDecimal selectArrearsByVipId(Long vipId);
}