Merge branch 'master' of http://nonxin.cn:8090/r/project/xnfg

354798ggg

2023-08-29 fd0c7c174d7b7313aa49061df05350405a3c1bf1

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

@@ -81,7 +81,7 @@
                filter += " and "+dataFilter;

            }

        }

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

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

        baseDao.loadPromptData(dt);

        return dt;

    }