Merge remote-tracking branch 'origin/master'

fengxiang

2018-07-24 7a52cd14e12e5b1053a26ed5a4799da7a09d4b16

 src/main/java/com/moral/controller/OrganizationController.java

@@ -42,7 +42,7 @@
    @GetMapping("get-my-org")
    public ResultBean<Organization> getMyOrganization(JwtAuthenticationToken token){
        UserContext userContext = token.getPrincipal();
        Organization organization = organizationService.getOrganizationsById(userContext.getOrganizationId());
        Organization organization = organizationService.getOrganizationById(userContext.getOrganizationId());
        return new ResultBean<>(organization);
    }
}