Commits
Merge remote-tracking branch 'origin/master' into NSS-5 # Conflicts: # nss-api/pom.xml # nss-server/pom.xml # nss-server/src/main/java/org/powerimo/nss/server/AppUtils.java # nss-server/src/main/java/org/powerimo/nss/server/NssServerApplication.java # nss-server/src/main/java/org/powerimo/nss/server/controller/AccountController.java # nss-server/src/main/java/org/powerimo/nss/server/controller/OutboundNotificationController.java # nss-server/src/main/java/org/powerimo/nss/server/persistance/entity/GroupEntity.java # nss-server/src/main/java/org/powerimo/nss/server/persistence/repo/AppLockRepository.java # nss-server/src/main/java/org/powerimo/nss/server/persistence/repo/CustomRepository.java # nss-server/src/main/java/org/powerimo/nss/server/persistence/repo/CustomRepositoryImpl.java # nss-server/src/main/java/org/powerimo/nss/server/persistence/repo/GroupRepository.java # nss-server/src/main/java/org/powerimo/nss/server/persistence/repo/NotificationUserRepository.java # nss-server/src/main/java/org/powerimo/nss/server/persistence/repo/SysUserAccountRepository.java # nss-server/src/main/java/org/powerimo/nss/server/persistence/repo/TransportRepository.java # nss-server/src/main/java/org/powerimo/nss/server/service/AccountService.java # nss-server/src/main/java/org/powerimo/nss/server/service/RequestService.java # pom.xml
