Merge branch 'develop' into release/1.0
commitfb0cf2942c50fcdcf3f0dc2649ad3e9d4d852d7c
author尹建华 <yinjianhua@credithundred.com>
Sat, 30 Jul 2016 03:36:26 +0000 (30 11:36 +0800)
committer尹建华 <yinjianhua@credithundred.com>
Sat, 30 Jul 2016 03:36:26 +0000 (30 11:36 +0800)
tree0431dfd2280148743024c911eec05d1d1f093c8a
parentee8a352cf33df0716bfe61cd7447f6d03751e68b
parent5458d949c047f9b3a5102e7c1725eb2d83e892b0
Merge branch 'develop' into release/1.0
pom.xml