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

rk

4 天以前 8c4dfb07d551ceb372887ff8f22bd1f574d0347b

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

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

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.business.model.JkCustomer;
import org.springframework.web.multipart.MultipartFile;

import java.util.List;

/**
@@ -25,7 +28,7 @@
     *
     * @param id 主键
     */
    void deleteById(Integer id);
    void deleteById(Integer id,LoginUserInfo user);

    /**
     * 删除
@@ -39,7 +42,7 @@
     *
     * @param ids 主键集
     */
    void deleteByIdInBatch(List<Integer> ids);
    void deleteByIdInBatch(List<Integer> ids,LoginUserInfo user);

    /**
     * 主键更新
@@ -94,4 +97,8 @@
     * @return long
     */
    long count(JkCustomer jkCustomer);

    List<JkCustomer> importBatch(MultipartFile file, LoginUserInfo loginUser);

    void checkNullLocation();
}