Merge branch 'beta_house_1.0' of http://192.168.1.220:10080/Amoy2/wlyy2.0 into beta_house_1.0

svr/svr-healthy-house/src/main/java/com/yihu/jw/healthyhouse/controller/user/FacilityUsedRecordController.java

@@ -79,7 +79,7 @@ public class FacilityUsedRecordController extends EnvelopRestEndpoint {
            @RequestBody FacilityUsedRecord facilityUsedRecord) throws IOException, ManageException {
        facilityUsedRecord.setUserId(facilityUsedRecord.getCreateUser());
        facilityUsedRecord = facilityUsedRecordService.save(facilityUsedRecord);
        if (facilityUsedRecord.getCreateUser() != null) {
        if (!StringUtils.isEmpty(facilityUsedRecord.getCreateUser())) {
            userService.updateFacilityUse(facilityUsedRecord.getCreateUser());
        }
        return success(facilityUsedRecord);

svr/svr-healthy-house/src/main/java/com/yihu/jw/healthyhouse/interceptor/ActivatedInterceptor.java

@@ -108,7 +108,7 @@ public class ActivatedInterceptor {
        }
        String userId = request.getHeader("userId");
        System.out.println(userId);
        System.out.println("userId: " + userId);
        if (userId == null) {
            return joinPoint.proceed();
        }