Change-Id: Ife8f072958ef3be7d0b0a74b946a58118320458d
Merge branch 'master' of 192.168.1.10:/home/scm/repositories/sxj-src
Change-Id: I905b793874907f6f1d75eacf16ab1782d4e921bb
Merge branch 'master' of 192.168.1.10:/home/scm/repositories/sxj-src

Conflicts:
	supervisor-parent/supervisor-manager/src/main/resources/mybatis/mybatis-config.xml