Merge branch 'dev' of yeshijie/wlyy2.0 into dev

svr/svr-iot/src/main/java/com/yihu/iot/service/monitorPlatform/MonitorPlatformService.java

@@ -350,7 +350,7 @@ public class MonitorPlatformService  {
                sql+= " date_format(time,'%Y') ";
                break;
            case "day":
                sql+= " date_format(time,'%%Y-%m-%d') ";
                sql+= " date_format(time,'%Y-%m-%d') ";
                break;
            case "week":
                sql+= " date_format(time,'%u') ";