机房作业
Merge remote-tracking branch 're/master'

Conflicts:
	sbgl/.myhibernatedata
	sbgl/src/hibernate.cfg.xml