Merge branch 'master' into dev/设备和平台使用不同的优化策略

src/main/java/com/genersoft/iot/vmp/gb28181/dao/provider/DeviceChannelProvider.java

@@ -101,7 +101,7 @@ public class DeviceChannelProvider {
             }
             sqlBuild.append(" )");
         }
-        sqlBuild.append("ORDER BY device_id");
+        sqlBuild.append(" ORDER BY device_id");
         return sqlBuild.toString();
     }