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

xiaoyong931011

2021-07-22 f4ef9fccb3347fd364ca59575bf62fe5e4362f59

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

@@ -15,5 +15,5 @@

    List<JhyOrderListVo> selectJhyOrderList(@Param("record") JhyOrderListDto jhyOrderListDto);

    List<JhyStatusCountVo> selectOrderStatusCount(@Param("userId") String userId);
    List<JhyStatusCountVo> selectOrderStatusCount(@Param("type") Integer type, @Param("userId") String userId);
}