diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/ComponentPackingController.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/ComponentPackingController.java index d570dac5..65cf4ba9 100644 --- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/ComponentPackingController.java +++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/ComponentPackingController.java @@ -60,8 +60,7 @@ public class ComponentPackingController { */ @PostMapping("search") public ApiResult> search(@Valid @RequestBody ComponentPackingQO request) { - PageData pageData = PageUtil.convert(wmscomponentPackingService.search(request), d -> Convert.convert(ComponentPackingVO.class, d)); - return ApiResult.success(pageData); + return ApiResult.success(wmscomponentPackingService.search(request)); } /** diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/ComponentPackingQO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/ComponentPackingQO.java index d5537c42..093a6995 100644 --- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/ComponentPackingQO.java +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/ComponentPackingQO.java @@ -1,5 +1,6 @@ package com.nflg.wms.common.pojo.qo; +import com.fasterxml.jackson.annotation.JsonProperty; import lombok.Data; import lombok.experimental.Accessors; @@ -19,6 +20,7 @@ public class ComponentPackingQO extends SearchBaseQO { /** * 办事处代理商 */ + @JsonProperty("pName") private String pName;