Merge branch 'master' of http://xufenglei@blit.7drlb.com:8888/r/screen_api_...

xufenglei

2019-06-17 dbed3099ea0dd2a517b739f29943d4ee529760e6

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

@@ -1002,7 +1002,6 @@
            map.put("values", values);

            map.put("units", units);

        }

        System.out.println("ScreenController-----AIForecast-----list:"+list);

      return new ResultBean<List<Map<String, Object>>>(list);

   }