yeshijie/wlyy2.0: 城市i健康 2.0代码 @ 4c59cd59c522e89c5b4dbab8feda0e09a0a5e34c

Progr1mmer 4c59cd59c5 Merge remote-tracking branch 'origin/dev' into dev		6 éve
..
common-entity	7cae4e00d5 冲突	6 éve
common-entity-es	ae5b6845e1 wlyy2.0整改	6 éve
common-exception	a40e972917 基础信息	6 éve
common-fegin	277a394f54 Merge branch 'dev' of http://192.168.1.220:10080/jiwei/jw2.0 into dev	6 éve
common-request-mapping	4c59cd59c5 Merge remote-tracking branch 'origin/dev' into dev	6 éve
common-rest-model	1c5b39fb66 包统一	6 éve
common-rest-model-es	53dcdf7d49 Pom	6 éve
common-util	2e301af43d Merge remote-tracking branch 'origin/dev' into dev	6 éve
common-web	be0aa8cf68 基础信息	6 éve