hexiugang/iamberry-common-parent: iamberry-common-parent @ 62386fec3735cf8d05ca5413d8de67b715c9b9e4

liuzhiwei 62386fec37 Merge branch 'master' of http://git.iamberry.com/hexiugang/iamberry-common-parent		%!s(int64=7) %!d(string=hai) anos
..
java	0af6eba8c4 软硬件版本号修改	%!s(int64=7) %!d(string=hai) anos
resources	326b2ef03c 删除idea配置文件	%!s(int64=7) %!d(string=hai) anos
webapp	7d4e2f90c1 员工修改	%!s(int64=7) %!d(string=hai) anos