类目添加删除添加课程规格化
Merge remote-tracking branch 'origin/master'

Conflicts:
	Test_regress/src/config.ini