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

Helius

2021-06-30 f3bf2c69494bb78afa098819b742677dd8be6b7c

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

@@ -3,6 +3,7 @@
import com.xzx.gc.entity.JhyOrder;
import com.xzx.gc.shop.dto.QueryJhyOrderListDto;
import com.xzx.gc.shop.vo.QueryJhyOrderListVo;
import com.xzx.gc.shop.vo.ViewJhyOrderVo;
import com.xzx.gc.util.GcMapper;
import org.apache.ibatis.annotations.Param;

@@ -12,4 +13,5 @@

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

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