增加实验报告输入，计算功能 /AnlianTest/experimentCalculation
Merge branch 'master' of https://github.com/MYMMoonDT/anliantest.git

Conflicts:
	anliantest-web/src/main/resources/jdbc.properties