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

jyy

2021-03-12 baa79615425b71521e67ec8a9344b88ce53fc5de

 zq-erp/src/main/java/com/matrix/system/hive/service/SysOrderItemService.java

@@ -72,7 +72,8 @@
    */
   public Integer findDclItemTotal(Long vipId);

   	
   public List<SysOrderItem> findByOrderId(Long orderId);

  


}