diff --git a/fastbee-admin/src/main/java/com/fastbee/web/controller/system/SysRoleController.java b/fastbee-admin/src/main/java/com/fastbee/web/controller/system/SysRoleController.java
index 33d55164..ef80110a 100644
--- a/fastbee-admin/src/main/java/com/fastbee/web/controller/system/SysRoleController.java
+++ b/fastbee-admin/src/main/java/com/fastbee/web/controller/system/SysRoleController.java
@@ -68,8 +68,8 @@ public class SysRoleController extends BaseController {
             tableDataInfo.setRows(list);
             tableDataInfo.setTotal(0);
         } else {
-            List list1 = CollectionUtils.startPage(list, pageNum, pageSize);
-            tableDataInfo.setRows(list1);
+            List<SysRole> result = CollectionUtils.startPage(list, pageNum, pageSize);
+            tableDataInfo.setRows(result);
             tableDataInfo.setTotal(new PageInfo(list).getTotal());
         }
         return tableDataInfo;
diff --git a/fastbee-common/src/main/java/com/fastbee/common/utils/collection/CollectionUtils.java b/fastbee-common/src/main/java/com/fastbee/common/utils/collection/CollectionUtils.java
index a8960176..433f65c8 100644
--- a/fastbee-common/src/main/java/com/fastbee/common/utils/collection/CollectionUtils.java
+++ b/fastbee-common/src/main/java/com/fastbee/common/utils/collection/CollectionUtils.java
@@ -233,16 +233,15 @@ public class CollectionUtils {
      * @param pageSize 每页多少条数据
      * @return
      */
-    public static List startPage(List list, Integer pageNum,
-                                 Integer pageSize) {
+    public static <T> List<T> startPage(List<T> list, Integer pageNum, Integer pageSize) {
         if (list == null) {
             return null;
         }
-        if (list.size() == 0) {
+        if (list.isEmpty()) {
             return null;
         }
         Integer count = list.size(); // 记录总数
-        Integer pageCount = 0; // 页数
+        int pageCount = 0; // 页数
         if (count % pageSize == 0) {
             pageCount = count / pageSize;
         } else {
@@ -257,7 +256,7 @@ public class CollectionUtils {
             fromIndex = (pageNum - 1) * pageSize;
             toIndex = count;
         }
-        List pageList = list.subList(fromIndex, toIndex);
+        List<T> pageList = list.subList(fromIndex, toIndex);
         return pageList;
     }
 }
diff --git a/fastbee-open-api/src/main/java/com/fastbee/controller/device/DeviceController.java b/fastbee-open-api/src/main/java/com/fastbee/controller/device/DeviceController.java
index 7861d593..55c6dee7 100644
--- a/fastbee-open-api/src/main/java/com/fastbee/controller/device/DeviceController.java
+++ b/fastbee-open-api/src/main/java/com/fastbee/controller/device/DeviceController.java
@@ -450,7 +450,7 @@ public class DeviceController extends BaseController {
             list2 = list1;
         }
         if (CollectionUtils.isNotEmpty(list2)) {
-            List resultList = com.fastbee.common.utils.collection.CollectionUtils.startPage(list2, pageNum, pageSize);
+            List<ThingsModelDTO> resultList = com.fastbee.common.utils.collection.CollectionUtils.startPage(list2, pageNum, pageSize);
             rspData.setRows(resultList);
         } else {
             rspData.setRows(new ArrayList<>());