Merge remote-tracking branch 'origin/develop' into develop

src/dsb/com/cnd3b/restcontroller/publicmethod/live/live.java

@@ -73,10 +73,10 @@ public class live extends Controller {
             double pageTotal = Math.ceil((double) flivecount / (double) pageSize);//×ÜÒ³Êý
             int startindex = (pageNumber - 1) * pageSize;
             int endindex = (pageNumber) * pageSize - 1;
-            if (pageNumber >= pageTotal) {
-                startindex = flivecount - pageSize;
-                endindex = flivecount - 1;
-            }
+//            if (pageNumber >= pageTotal) {
+//                startindex = flivecount - pageSize;
+//                endindex = flivecount - 1;
+//            }
             for (int i = 0; i < flivecount; i++) {
                 if (startindex <= i && i <= endindex) {
                     newliverows.add(liverows.get(i));