Merge branch 'web_backend_develope' of
							
							
							
							
							
							
							
							https://git.trustie.net/fhx569287825/aggregation-platform into
web_backend_develope
Conflicts:
	src/com/platform/controller/DataModelController.java
	src/com/platform/oracle/OracleConnector.java
	src/com/platform/service/OracleExtractHelper.java
	src/com/platform/service/impl/OracleExtractServiceImpl.java 
							
						 |