Report bug fixed
Merge branch 'master' of https://github.com/maninsoft/smartworksV3.git

Conflicts:
	WebContent/jsp/content/work/report/work_report_edit.jsp