Merge branch 'score_shop' into api_score_meger

935090232@qq.com

2021-05-08 e53fcbe9fe844b7788b29c5106c1ac24d17c5535

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

@@ -3,6 +3,7 @@
import com.matrix.core.pojo.PaginationVO;
import com.matrix.system.app.vo.OrderDetailItemVo;
import com.matrix.system.hive.bean.SysOrderItem;
import com.matrix.system.shopXcx.api.vo.ErpOrderDetailItemVo;
import org.apache.ibatis.annotations.Param;

import java.util.Date;
@@ -61,4 +62,8 @@
   public int   deleteByOrderId(Long id);

   List<OrderDetailItemVo> selectApiOrderDetailItemsByOrderId(@Param("orderId") Long orderId);

    List<ErpOrderDetailItemVo> selectErpOrderItemByOrderId(String orderId);

   List<SysOrderItem> selectDgd();
}