添加model(notice,photo,school)
add
Merge branch 'master' of github.com:hyrtyp/CNP_Base

Conflicts:
	CNP_Base.iml