Merge branch 'score-shop' of http://120.27.238.55:7000/r/xzx into score-shop

xiaoyong931011

2021-11-10 b0c195d4628b9086fb6e3f16759d15cf49100a50

 gc-order/src/main/java/com/xzx/gc/order/mapper/OrderMapper.java

@@ -226,5 +226,7 @@
    List<OrderInfo> selectOrderNoWaitAndCancel(@Param("userId") String userId);

    List<InviteUserOrderVo> selectInviteUserOrderList(@Param("record") InviteUserOrderDetailsDto detailsDto);

    List<OrderInfo> selectOrderWithWaitAndIng(@Param("userId") String userId);
}