Commit c71c64538ef1ad0c1a4fd8c68ad41a4ec8ae45c3
1 parent
099535ca
1
Showing
1 changed file
with
2 additions
and
4 deletions
src/com/fh/controller/sunvote/homework/HomeworkController.java
| ... | ... | @@ -245,11 +245,9 @@ public class HomeworkController extends BaseController { |
| 245 | 245 | pd.put("TEACHER_ID", getTeacherID()); |
| 246 | 246 | List<PageData> list = coursemanagementService.listTeacherClass(pd); |
| 247 | 247 | for(PageData ptd : list){ |
| 248 | -<<<<<<< HEAD | |
| 249 | - ptd.put("ClASS_ID", pd.get("ID")); | |
| 250 | -======= | |
| 248 | + | |
| 251 | 249 | ptd.put("CLASS_ID", ptd.get("ID")); |
| 252 | ->>>>>>> bd553929bab8314313b820c4fd78254ca1640230 | |
| 250 | + | |
| 253 | 251 | ptd.put("TEACHER_ID", pd.get("TEACHER_ID")); |
| 254 | 252 | List<PageData> homeworkList = homeworkService.listAll(ptd); |
| 255 | 253 | for(PageData hpd:homeworkList){ | ... | ... |