Merge remote-tracking branch 'origin/master'

kaiyu

2020-12-07 cf42a18aba4da77141dd0ea65918444636f899e1

 src/main/java/com/moral/controller/ScreenController.java

@@ -727,6 +727,7 @@
             */
            /*改动范围start-------------------------------------------------------------------------*/
            list.remove(0);
            //if (list.size() == 23) {
                SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
                SimpleDateFormat sdf2 = new SimpleDateFormat("yyyy-MM-dd");
                //获取全格式时间yyyy-MM-dd HH:mm:ss
@@ -744,9 +745,10 @@
                    datas.put("time",time1);
                    list.add(datas);
                }

            //}
            /*改动范围end-------------------------------------------------------------------------*/


            for (Map<String, Object> map : list) {
                String time = map.get("time").toString();
                time = time.substring(time.length() - 2);