conflect fix

Helius

2021-06-11 289b0503bc197d196997142f60b3a8ef8b70f0cc

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