Commit Graph

7 Commits

Author SHA1 Message Date
ladventure f6ec25e494 1.修复汇总bug
2.添加@RestController
2017-12-18 16:50:44 +08:00
lily b8f723d05d lili 2016-09-24 20:21:04 +08:00
chenlw fead9d9371 Merge branch 'web_backend_develope' of
https://git.trustie.net/fhx569287825/aggregation-platform into
web_backend_develope

Conflicts:
	src/com/base/BaseController.java
	src/com/platform/controller/DataModelController.java
	src/com/platform/service/impl/MoveDataServiceImpl.java
	src/com/platform/service/impl/OracleExtractServiceImpl.java
	src/com/platform/utils/Constant.java
2016-09-20 20:45:20 +08:00
wu ming a82a9b0397 update .gitignore 2016-09-20 15:03:20 +08:00
wu ming d35115800d update .gitignore 2016-09-20 14:13:39 +08:00
Chariesliven 8b64314d95 增加BaseController全局异常捕获 2016-09-07 23:59:30 +08:00
wu ming c66ba751a7 汇总平台java后台V1版 2016-09-07 17:13:59 +08:00