Merge branch 'zhaoyue-dev4' into 'master'

ADD member pulse and breathrate



See merge request !47

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