Merge remote-tracking branch 'origin/master'

许鹏程

2024-08-21 ab7ddb13ba6ea769748d1ee67255a53ad7913554

 src/main/java/com/product/administration/service/BusinessTripService.java

@@ -45,7 +45,7 @@
        if(!StringUtils.isEmpty(dataFilter)){
            filter += " and "+dataFilter;
        }
        DataTableEntity dt = baseDao.listTable(CmnConst.PRODUCT_SYS_BUSINESS_TRIP,filter,null,null,null,fs.getInteger(CmnConst.PAGESIZE),fs.getInteger(CmnConst.CPAGE));
        DataTableEntity dt = baseDao.listTable(CmnConst.PRODUCT_SYS_BUSINESS_TRIP,filter,null,null,"created_utc_datetime desc",fs.getInteger(CmnConst.PAGESIZE),fs.getInteger(CmnConst.CPAGE));
        baseDao.loadPromptData(dt);
        return dt;
    }