增加一个材料内容属性
Merge branch 'master' of https://github.com/jeasonyoung/examw-test

Conflicts:
	src/main/java/com/examw/test/model/library/BaseItemInfo.java