diff --git a/src/main/java/com/yxt/warehouse/biz/warehousearea/WarehouseArea.java b/src/main/java/com/yxt/warehouse/biz/warehousearea/WarehouseArea.java index 2ce3b7b..aaf986b 100644 --- a/src/main/java/com/yxt/warehouse/biz/warehousearea/WarehouseArea.java +++ b/src/main/java/com/yxt/warehouse/biz/warehousearea/WarehouseArea.java @@ -21,4 +21,5 @@ public class WarehouseArea extends BaseEntity { private String volume;//库位容量 private String unit;//计量单位 private String areaTypeSid;//货区类型 + private String useOrgSid; } diff --git a/src/main/java/com/yxt/warehouse/biz/warehousearea/WarehouseAreaDto.java b/src/main/java/com/yxt/warehouse/biz/warehousearea/WarehouseAreaDto.java index f20a3a0..3ee58e4 100644 --- a/src/main/java/com/yxt/warehouse/biz/warehousearea/WarehouseAreaDto.java +++ b/src/main/java/com/yxt/warehouse/biz/warehousearea/WarehouseAreaDto.java @@ -24,5 +24,5 @@ public class WarehouseAreaDto implements Dto { private String volume;//库位容量 private String unit;//计量单位 private String areaTypeSid;//货区类型 - + private String useOrgSid; } diff --git a/src/main/java/com/yxt/warehouse/biz/warehousearea/WarehouseAreaService.java b/src/main/java/com/yxt/warehouse/biz/warehousearea/WarehouseAreaService.java index 4d69ab4..a055347 100644 --- a/src/main/java/com/yxt/warehouse/biz/warehousearea/WarehouseAreaService.java +++ b/src/main/java/com/yxt/warehouse/biz/warehousearea/WarehouseAreaService.java @@ -53,10 +53,10 @@ public class WarehouseAreaService extends MybatisBaseService p = new PagerVo<>(); return rb.success().setData(p); - } + }*/ } // else { // PagerVo p = new PagerVo<>(); @@ -75,9 +75,9 @@ public class WarehouseAreaService extends MybatisBaseService page = PagerUtil.queryToPage(pq); IPage pagging = baseMapper.listPage(page, qw); PagerVo p = PagerUtil.pageToVo(pagging, null);