Merge remote-tracking branch 'origin/master'

许鹏程

2023-08-04 1a6ef2d4050a4da27c829688d5f84f26bd4caf72

 home-server-admin/src/main/java/com/home/xining/service/TravelTrainingService.java

@@ -77,7 +77,7 @@
        if(!BaseUtil.dataTableIsEmpty(fs.getSubDataTable("systemSeniorQueryString"))){

            filter   = filter + " and " + queryFilterService.getQueryFilter(fs);

        }

        DataTableEntity dt = baseDao.listTable(CmnConst.APP_GZRYCCSPB,filter,null,null,null,fs.getInteger(CmnConst.PAGESIZE),fs.getInteger(CmnConst.CPAGE));

        DataTableEntity dt = baseDao.listTable(CmnConst.APP_GZRYCCSPB,filter,null,null," ag00 desc ",fs.getInteger(CmnConst.PAGESIZE),fs.getInteger(CmnConst.CPAGE));

        baseDao.loadPromptData(dt);

        return dt;

    }