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

xiaoyong931011

2021-08-09 e847891c4f6f12cee5e764f8c1fad001496b9740

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

@@ -221,5 +221,7 @@

    List<OrderInfo> findListOrderReceiveTime(@Param("receiver")String receiver);

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

}