Merge remote-tracking branch 'origin/master'

Pu Zhibing

1 天以前 f6f4e7beea525f0c450d618fdc93f112c6813edc

 ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/shunfeng/controller/AppComplaintsController.java

@@ -98,7 +98,7 @@
        if(SinataUtil.isNotEmpty(endTime)){
            appComplaintsEntityWrapper.le("addTime",endTime +" 23:59:59");
        }
//        appComplaintsEntityWrapper.eq("type",1);
//        appComplaintsEntityWrapper.eq("type",3);
        Page<AppComplaints> page = new PageFactory<AppComplaints>().defaultPage();
        appComplaintsEntityWrapper.orderBy("addTime",false);//
        page.setRecords(appComplaintsService.selectMapsPage(page, appComplaintsEntityWrapper).getRecords());