Merge remote-tracking branch 'origin/wuhuyancao' into wuhuyancao

doum

6 天以前 308bc8e5c0db7298a127f3478995ddc6167328e9

 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/InoutRecordService.java

@@ -4,6 +4,7 @@
import com.doumee.dao.business.model.InoutRecord;
import com.doumee.dao.business.vo.GeneralDataVO;
import com.doumee.dao.business.vo.InParkUserDataVO;
import com.doumee.dao.business.vo.TelecomInParkDataVO;
import com.doumee.service.business.third.model.PageData;
import com.doumee.service.business.third.model.PageWrap;

@@ -107,4 +108,6 @@
    List<List<String>> getReportList(InParkDataDTO inParkDataDTO);

    void excel(InParkDataDTO inParkDataDTO, HttpServletResponse response);

    TelecomInParkDataVO getInParkDataForTelecom();
}