Merge branch 'master' of https://github.com/LuckyStars/nbc · LuckyStars/nbc@3ecea8e · GitHub

Commit

Merge branch 'master' of https://github.com/LuckyStars/nbc

Browse files

Conflicts:
	function-schoolmaster2/java/function-schoolmaster2/src/main/com/nbcedu/function/schoolmaster2/biz/impl/SM2MasterSubBizImpl.java
	sm2/WebRoot/function/function-masterSubList/daibanshiyi.jsp

Loading branch information

jonathanwl committed Nov 29, 2013

2 parents 01b9dd8 + 3761f4e commit 3ecea8e