parameterDao
注册
Merge remote-tracking branch 'origin/master'

Conflicts:
	OilManage/src/cn/edu/cup/manage/dao/ParameterDao.java