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

zjj

昨天 4114759a57d73661937f28a765fb8a67c017b14b

 rsf-server/src/main/java/com/vincent/rsf/server/manager/service/OutStockItemService.java

@@ -7,6 +7,7 @@
import com.vincent.rsf.server.common.domain.BaseParam;
import com.vincent.rsf.server.common.domain.PageParam;
import com.vincent.rsf.server.manager.entity.AsnOrderItem;
import com.vincent.rsf.server.manager.entity.LocItem;
import org.springframework.web.multipart.MultipartFile;

import java.util.HashMap;
@@ -20,6 +21,5 @@
    R excelImport(MultipartFile file, HashMap<String, Object> hashMap, Long loginUserId) throws Exception;

    IPage<Map<String, Object>> listByAsnId(PageParam<AsnOrderItem, BaseParam> pageParam, QueryWrapper<AsnOrderItem> buildWrapper);


}