Merge branch 'score_shop' into api_score_meger

jyy

2021-06-09 050a6e05bf85df074d24e9f5e06cc0d618019ccc

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

@@ -64,4 +64,6 @@
   List<OrderDetailItemVo> selectApiOrderDetailItemsByOrderId(@Param("orderId") Long orderId);

    List<ErpOrderDetailItemVo> selectErpOrderItemByOrderId(String orderId);

   List<SysOrderItem> selectDgd();
}