Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/IgoTravel i...

无关风月

2024-07-17 c29b1d7c9d312466cdbac1add88ee5c728135095

 ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TSystemPriceController.java

@@ -175,7 +175,7 @@
    @ResponseBody
    public Object listSmall(String name,Integer state) {
        Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage();
        page.setRecords(tSystemPriceService.getSpecialPriceList(page,ShiroKit.getUser().getObjectId(),name,state));
        page.setRecords(tSystemPriceService.getSpecialPriceList1(page,ShiroKit.getUser().getObjectId(),name,state));
        return super.packForBT(page);
    }