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

jyy

2021-03-15 53939e0ceb528f45c4906c86ce499ecb864f7af8

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

  


}