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

xiaoyong931011

2021-06-29 bd1dfc46c917596265f61fe279ed024478a6a59e

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

@@ -13,5 +13,5 @@

    List<QueryJhyOrderListVo> queryOrderList(@Param("record") QueryJhyOrderListDto model);

    ViewJhyOrderVo viewJhyOrder(@Param("id")Long id);
    ViewJhyOrderVo viewJhyOrder(@Param("id") Long id);
}