Commit eaf1257979c5dd8b7bd819ed3a0329362d2d2176

Authored by jiangjiazhi
Exists in master

Merge remote-tracking branch 'origin/master'

Showing 2 changed files

platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyBuildController.java View file @ eaf1257
... ... @@ -379,7 +379,7 @@
379 379 @RequestMapping(method = RequestMethod.GET, value = "/getBabyGroupCount")
380 380 @ResponseBody
381 381 @TokenRequired
382   - public BaseResponse getBabyGroupCount(@Valid @RequestBody BabyManageRequest babyManageRequest,
  382 + public BaseResponse getBabyGroupCount(@Valid BabyManageRequest babyManageRequest,
383 383 HttpServletRequest request) {
384 384 LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
385 385 return babyBookbuildingFacade.getBabyGroupCount(babyManageRequest, loginState.getId());
... ... @@ -393,7 +393,7 @@
393 393 @RequestMapping(method = RequestMethod.GET, value = "/getBabyGroupRightCount")
394 394 @ResponseBody
395 395 @TokenRequired
396   - public BaseResponse getBabyGroupRightCount(@Valid @RequestBody BabyManageRequest babyManageRequest,HttpServletRequest request,
  396 + public BaseResponse getBabyGroupRightCount(@Valid BabyManageRequest babyManageRequest,HttpServletRequest request,
397 397 @RequestParam("page") Integer page,
398 398 @RequestParam("limit") Integer limit){
399 399 LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TestController.java View file @ eaf1257
... ... @@ -13,8 +13,6 @@
13 13 import com.lyms.platform.permission.service.OrganizationService;
14 14 import com.lyms.platform.pojo.*;
15 15 import com.lyms.platform.query.*;
16   -import javafx.scene.shape.LineTo;
17   -import com.lyms.platform.pojo.*;
18 16 import com.lyms.platform.query.AntExChuQuery;
19 17 import com.lyms.platform.query.AntExQuery;
20 18 import com.lyms.platform.query.MatDeliverQuery;