Amoy2/wlyy2.0: 城市i健康 2.0代码 @ a8bef372b4d41a7c6f44101f56e784c9488d2b16

mengkang 5b44fc4d11 Merge branch 'dev' of http://192.168.1.220:10080/Amoy2/wlyy2.0 into dev		%!s(int64=5) %!d(string=hai) anos
..
java	5b44fc4d11 Merge branch 'dev' of http://192.168.1.220:10080/Amoy2/wlyy2.0 into dev	%!s(int64=5) %!d(string=hai) anos
resources	e656d86065 Merge branch 'dev' of http://192.168.1.220:10080/Amoy2/wlyy2.0 into dev	%!s(int64=5) %!d(string=hai) anos
template	10b29cdcf7 基础人口信息模板添加	%!s(int64=6) %!d(string=hai) anos