Commit c9167c91 authored by liboyang's avatar liboyang

Merge remote-tracking branch 'origin/dev' into dev

parents 9384c6f1 21ee0f00
...@@ -863,7 +863,7 @@ public class TaskListServiceImpl implements TaskListService { ...@@ -863,7 +863,7 @@ public class TaskListServiceImpl implements TaskListService {
countyMapGroup.put("specialCount", specialCount); countyMapGroup.put("specialCount", specialCount);
countyMapGroup.put("countyCode", countyCode); countyMapGroup.put("countyCode", countyCode);
countyMapGroup.put("taskId", taskId); countyMapGroup.put("taskId", taskId);
countyMapGroup.put("policeList", countyMapList); countyMapGroup.put("groupList", countyMapList);
countyMapGroup.put("saveDate", submitDate); countyMapGroup.put("saveDate", submitDate);
countyMapGroup.put("countyName", countyName); countyMapGroup.put("countyName", countyName);
countyMapGroup.put("countyValidCount", validCount); countyMapGroup.put("countyValidCount", validCount);
...@@ -963,7 +963,7 @@ public class TaskListServiceImpl implements TaskListService { ...@@ -963,7 +963,7 @@ public class TaskListServiceImpl implements TaskListService {
countyMapGroup.put("specialCount", specialCount); countyMapGroup.put("specialCount", specialCount);
countyMapGroup.put("countyCode", countyCode); countyMapGroup.put("countyCode", countyCode);
countyMapGroup.put("taskId", taskId); countyMapGroup.put("taskId", taskId);
countyMapGroup.put("policeList", countyMapList); countyMapGroup.put("groupList", countyMapList);
countyMapGroup.put("saveDate", submitDate); countyMapGroup.put("saveDate", submitDate);
countyMapGroup.put("countyName", countyName); countyMapGroup.put("countyName", countyName);
countyMapGroup.put("countyValidCount", validCount); countyMapGroup.put("countyValidCount", validCount);
......
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