Authored by zhaoyue

Merge branch 'zhaoyue-dev4' into 'master'

ADD member pulse and breathrate



See merge request !47
@@ -47,7 +47,7 @@ public class PulseBreathSetController { @@ -47,7 +47,7 @@ public class PulseBreathSetController {
47 @RequestMapping(method = RequestMethod.POST) 47 @RequestMapping(method = RequestMethod.POST)
48 @ApiOperation(value = "admin设置用户当前的呼吸频率和脉搏") 48 @ApiOperation(value = "admin设置用户当前的呼吸频率和脉搏")
49 public ResponseEntity<ResultModel> setPulseBreath(HttpServletRequest request, @CurrentAdmin XklAdminEntity admin, @RequestParam String username, 49 public ResponseEntity<ResultModel> setPulseBreath(HttpServletRequest request, @CurrentAdmin XklAdminEntity admin, @RequestParam String username,
50 - @RequestParam int pulse, @RequestParam int breathrate, @RequestParam String sign, @RequestParam long t) { 50 + @RequestParam int pulse, @RequestParam int breathrate, @RequestParam String sign, @RequestParam long t, @RequestParam int type) {
51 51
52 if (!(boolean) request.getAttribute("signAspect")) 52 if (!(boolean) request.getAttribute("signAspect"))
53 return new ResponseEntity<>(ResultModel.error(ResultStatus.SIGN_ERROR), HttpStatus.OK); 53 return new ResponseEntity<>(ResultModel.error(ResultStatus.SIGN_ERROR), HttpStatus.OK);