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/JhyOrderMapper.java

@@ -19,4 +19,6 @@
    List<JhyStatusCountVo> selectOrderStatusCount(@Param("type") Integer type, @Param("userId") String userId);

    List<JhyOrder> selectJhyOrderListByStatus(@Param("list") List<String> list, @Param("userId") String userId);

    List<JhyOrder> selectJhyOrderNoWaitAndCancel(@Param("userId") String userId);
}