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

rk

4 天以前 8c4dfb07d551ceb372887ff8f22bd1f574d0347b

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

@@ -1,8 +1,8 @@
package com.doumee.service.business;

import com.doumee.core.model.LoginUserInfo;
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.service.business.third.model.LoginUserInfo;
import com.doumee.service.business.third.model.PageData;
import com.doumee.service.business.third.model.PageWrap;
import com.doumee.dao.admin.request.CarsQuery;
import com.doumee.dao.admin.response.CarsDTO;
import com.doumee.dao.business.model.Cars;
@@ -91,7 +91,7 @@
     * @return PageData<Cars>
     */
    PageData<Cars> findPage(PageWrap<Cars> pageWrap);
    String importBatch(MultipartFile file, LoginUserInfo loginUserInfo);
    List<Cars> importBatch(MultipartFile file, LoginUserInfo loginUserInfo);
    /**
     * 条件统计
     *
@@ -106,4 +106,5 @@
     * @return
     */
    PageData<CarsDTO> findCarPage(PageWrap<CarsQuery> pageWrap);
    void dealCarsAuthBiz(List<Cars> carsList);
}