From 82c794aa1691821120ca4c6c8fda54a18cbb95f0 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期四, 16 七月 2020 11:01:32 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/luxiaotao1123/zy-asrs into xtyasrs

---
 src/main/java/com/zy/asrs/controller/MobileController.java |   11 +++++++++++
 1 files changed, 11 insertions(+), 0 deletions(-)

diff --git a/src/main/java/com/zy/asrs/controller/MobileController.java b/src/main/java/com/zy/asrs/controller/MobileController.java
index 4f3b62b..9e8be25 100644
--- a/src/main/java/com/zy/asrs/controller/MobileController.java
+++ b/src/main/java/com/zy/asrs/controller/MobileController.java
@@ -47,6 +47,17 @@
         return R.ok();
     }
 
+
+    /**
+     * 缁勬墭
+     */
+    @RequestMapping("/comb/form")
+    @ManagerAuth(memo = "缁勬墭")
+    public R combForm(@RequestParam CombParam combParam){
+        mobileService.comb(combParam, getUserId());
+        return R.ok();
+    }
+
     /**
      *  鏍规嵁搴撲綅鍙锋煡鎵惧簱瀛樻槑缁�
      */

--
Gitblit v1.9.1