modify query.
modified.
modified.
Merge branch 'master' of
https://github.com/cloudzon-jayesh/GratzeezAPP.git

Conflicts:
	GRATZEEZ_API/src/main/java/com/api/service/impl/GratuityOperationServiceImpl.java
	GRATZEEZ_API/src/main/webapp/WEB-INF/spring/appServlet/servlet-context.xml