Merge branch 'web_backend_develope' of https://git.trustie.net/fhx569287825/aggregation-platform
							
							
							
							
							
							
							
							Conflicts:
	build/classes/com/platform/controller/DataModelController.class
	build/classes/com/platform/controller/DefaultController.class
	build/classes/com/platform/entities/FolderNode.class
	build/classes/com/platform/service/OracleExtractService.class
	build/classes/com/platform/test/TestController.class
	build/classes/com/platform/test/TestEncodeInfoDao.class
	build/classes/com/platform/test/TestEncodeService.class
	build/classes/com/platform/utils/Configs.class
	build/classes/com/platform/utils/ConfigsLoader.class
	src/com/platform/controller/DataModelController.java 
							
						 |