..
Signed-off-by: Ryan <sgz09600@ly.com>
Merge branch 'master' of https://github.com/code-hero/slc

Conflicts:
	slc/slc-sample-base/src/main/java/com/slc/sample/base/service/impl/HibernateBaseServiceImpl.java
	slc/slc-sample/slc-sample-common/src/main/resources/jdbc.properties