Commit 91f01a0a by lixq

Merge branch 'master' of http://gitlib.occloud.net/biao/ZhiNanZhen

# Conflicts:
#	doc/DB/compass_db_schema.xlsx
#	src/cn/compass/entity/CourseMst.inc
parents 0ad2ad27 78541f4f
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment