From 058361ab0233f5e7d5dd4d6f674137432dd8d063 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Mon, 19 Apr 2021 17:58:43 +0800
Subject: [PATCH] Merge branch 'score_shop' of http://120.27.238.55:7000/r/beauty-erp into score_shop
---
zq-erp/src/main/java/com/matrix/system/hive/action/ProjServiceController.java | 10 ++++++++++
1 files changed, 10 insertions(+), 0 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/hive/action/ProjServiceController.java b/zq-erp/src/main/java/com/matrix/system/hive/action/ProjServiceController.java
index 1582cad..faed6f0 100644
--- a/zq-erp/src/main/java/com/matrix/system/hive/action/ProjServiceController.java
+++ b/zq-erp/src/main/java/com/matrix/system/hive/action/ProjServiceController.java
@@ -277,6 +277,7 @@
return "admin/hive/beautySalon/yypb-form";
}
+
/**
* 进入预约排班详情
*
@@ -452,6 +453,7 @@
}
}
+
/**
* 根据id取消预约
*/
@@ -561,6 +563,14 @@
}
}
+
+ @RequestMapping(value = "/addServiceProj")
+ @ResponseBody
+ public AjaxResult addServiceProj(SysProjServices sysProjServices) {
+
+ return AjaxResult.buildSuccessInstance("保存成功");
+ }
+
/**
* 删除服务单项目/套餐
* @param id
--
Gitblit v1.9.1