From 331ae50b1cdcb31a4a0c182abb82aec5c1b12f83 Mon Sep 17 00:00:00 2001
From: nickchange <126672920+nickchange@users.noreply.github.com>
Date: 星期三, 15 十一月 2023 09:40:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 cloud-server-activity/src/main/java/com/dsh/activity/controller/PointMercharsController.java |   10 +++++++++-
 1 files changed, 9 insertions(+), 1 deletions(-)

diff --git a/cloud-server-activity/src/main/java/com/dsh/activity/controller/PointMercharsController.java b/cloud-server-activity/src/main/java/com/dsh/activity/controller/PointMercharsController.java
index d1248d5..9619f4c 100644
--- a/cloud-server-activity/src/main/java/com/dsh/activity/controller/PointMercharsController.java
+++ b/cloud-server-activity/src/main/java/com/dsh/activity/controller/PointMercharsController.java
@@ -98,9 +98,17 @@
          pmdsService.changeState(dto);
     }
     /**
-     * 门票核销
+     * 根据id查询
      */
 
+    @RequestMapping("/base/pointMerchars/getById")
+    @ResponseBody
+    public PointsMerchandise getById(@RequestBody Integer id){
+        return pmdsService.getById(id);
+    }
+    /**
+     * 门票核销
+     */
     @RequestMapping("/base/course/changeState")
     @ResponseBody
     public Object changeState(@RequestBody CourseChangeStateDTO dto){

--
Gitblit v1.7.1