From 53939e0ceb528f45c4906c86ce499ecb864f7af8 Mon Sep 17 00:00:00 2001
From: jyy <935090232@qq.com>
Date: Mon, 15 Mar 2021 14:38:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/score_shop' into score_shop
---
zq-erp/src/main/java/com/matrix/system/score/action/ScoreOrderAction.java | 27 ++++++++++-----------------
1 files changed, 10 insertions(+), 17 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/score/action/ScoreOrderAction.java b/zq-erp/src/main/java/com/matrix/system/score/action/ScoreOrderAction.java
index 0338524..8598609 100644
--- a/zq-erp/src/main/java/com/matrix/system/score/action/ScoreOrderAction.java
+++ b/zq-erp/src/main/java/com/matrix/system/score/action/ScoreOrderAction.java
@@ -1,28 +1,21 @@
package com.matrix.system.score.action;
-import com.matrix.core.pojo.AjaxResult;
import com.matrix.system.score.service.ScoreOrderService;
-import io.swagger.annotations.Api;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RestController;
/**
- * @author wzy
- * @date 2021-02-22
- **/
-@Api(value = "积分订单", tags = "积分订单")
+ * @description 订单表
+ * @author jyy
+ * @date 2021-02-26 15:26
+ */
@RestController
-@RequestMapping(value = "/score/order")
+@RequestMapping(value = "admin/scoreOrder")
public class ScoreOrderAction {
- @Autowired
- private ScoreOrderService scoreOrderService;
+ @Autowired
+ private ScoreOrderService scoreOrderService;
- @GetMapping(value = "/testApi")
- public AjaxResult testApi() {
- scoreOrderService.testMethod();
- return AjaxResult.buildSuccessInstance("success");
- }
-}
+
+}
\ No newline at end of file
--
Gitblit v1.9.1