From 05683f2b2bdbdbe21cf17ad523c21ab338bd1c54 Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期二, 19 七月 2022 21:49:55 +0800
Subject: [PATCH] 优化添加设备 功能

---
 service-user/src/main/java/com/java110/user/api/ActivitiesRuleApi.java |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/service-user/src/main/java/com/java110/user/api/ActivitiesRuleApi.java b/service-user/src/main/java/com/java110/user/api/ActivitiesRuleApi.java
old mode 100644
new mode 100755
index 547ff75..2b0a4d0
--- a/service-user/src/main/java/com/java110/user/api/ActivitiesRuleApi.java
+++ b/service-user/src/main/java/com/java110/user/api/ActivitiesRuleApi.java
@@ -210,9 +210,15 @@
      */
     @RequestMapping(value = "/queryActivitiesBeautifulStaff", method = RequestMethod.GET)
     public ResponseEntity<String> queryActivitiesBeautifulStaff(@RequestHeader(value = "store-id", required = false) String storeId,
+                                                                @RequestParam(value = "ruleId", required = false) String ruleId,
+                                                                @RequestParam(value = "activitiesNum", required = false) String activitiesNum,
+                                                                @RequestParam(value = "staffName", required = false) String staffName,
                                                                 @RequestParam(value = "page") int page,
                                                                 @RequestParam(value = "row") int row) {
         ActivitiesBeautifulStaffDto activitiesBeautifulStaffDto = new ActivitiesBeautifulStaffDto();
+        activitiesBeautifulStaffDto.setStaffName(staffName);
+        activitiesBeautifulStaffDto.setRuleId(ruleId);
+        activitiesBeautifulStaffDto.setActivitiesNum(activitiesNum);
         activitiesBeautifulStaffDto.setPage(page);
         activitiesBeautifulStaffDto.setRow(row);
         activitiesBeautifulStaffDto.setStoreId(storeId);

--
Gitblit v1.8.0