From 1da9a96fd9f1031d81d5d829a2df18fd4ac5abd1 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Fri, 25 Jun 2021 14:42:48 +0800
Subject: [PATCH] Merge branch 'score-shop' of http://120.27.238.55:7000/r/xzx into score-shop

---
 gc-shop/src/main/java/com/xzx/gc/shop/controller/AdminOrderController.java |    3 ---
 1 files changed, 0 insertions(+), 3 deletions(-)

diff --git a/gc-shop/src/main/java/com/xzx/gc/shop/controller/AdminOrderController.java b/gc-shop/src/main/java/com/xzx/gc/shop/controller/AdminOrderController.java
index cccc2e8..a12d0b7 100644
--- a/gc-shop/src/main/java/com/xzx/gc/shop/controller/AdminOrderController.java
+++ b/gc-shop/src/main/java/com/xzx/gc/shop/controller/AdminOrderController.java
@@ -7,15 +7,12 @@
 import com.xzx.gc.common.constant.Constants;
 import com.xzx.gc.common.dto.log.OperationAppLog;
 import com.xzx.gc.common.request.BaseController;
-import com.xzx.gc.entity.ScoreGoods;
 import com.xzx.gc.entity.ScoreOrder;
 import com.xzx.gc.model.JsonResult;
 import com.xzx.gc.shop.dto.*;
 import com.xzx.gc.shop.mapper.ScoreOrderMapper;
 import com.xzx.gc.shop.service.OrderService;
-import com.xzx.gc.shop.vo.QueryGoodsListVo;
 import com.xzx.gc.shop.vo.QueryOrderListVo;
-import com.xzx.gc.shop.vo.ViewGoodsVo;
 import com.xzx.gc.shop.vo.ViewOrderVo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;

--
Gitblit v1.9.1