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

src/main/java/com/sooka/sponest/data/emergency/appmin/material/controller/AppMaterialController.java

@@ -27,16 +27,12 @@ public class AppMaterialController extends BaseController {
         try {
             // 开启分页
             startPage();
-
             // 查询数据
             List list = appMaterialService.geMaterialList(vo);
-
             // 移除空值
             list.removeAll(Collections.singleton(null));
-
             // 获取分页信息
             TableDataInfo tableDataInfo = getDataTable(list);
-
             // 直接返回数据，不需要手动构建 Map
             return AjaxResult.success(tableDataInfo.getRows());
         } catch (Exception e) {