- 
# Conflicts: # src/com/fh/controller/sunvote/homework/HomeworkController.java 
- 
# Conflicts: # src/com/fh/controller/sunvote/homework/HomeworkController.java 
- 
2.添加学校设置,其他设置 
# Conflicts: # src/com/fh/controller/sunvote/homework/HomeworkController.java
# Conflicts: # src/com/fh/controller/sunvote/homework/HomeworkController.java
2.添加学校设置,其他设置