Merge remote-tracking branch 'origin/master'

ruoyi-admin/src/main/java/com/ruoyi/web/controller/kaoqin/KaoQinController.java

@@ -140,8 +140,8 @@ public class KaoQinController extends BaseController {
         List list = new ArrayList();
         if (kaoqinRecords != null && kaoqinRecords.size() > 0) {
             Map<String, List<KaoqinRecord>> collect = kaoqinRecords.stream().collect(Collectors.groupingBy(KaoqinRecord::getKaTime));
-            Map<String, Object> map = new HashMap();
             for (String date : collect.keySet()) {
+                Map<String, Object> map = new HashMap();
                 List<KaoqinRecord> kaoqinRecords1 = collect.get(date);
                 //定义标签显示状态
                 String abnormal = "";