diff --git a/njzscloud-svr/src/main/java/com/njzscloud/dispose/wh/controller/WarehouseController.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/wh/controller/WarehouseController.java index 721f10a..c5e2991 100644 --- a/njzscloud-svr/src/main/java/com/njzscloud/dispose/wh/controller/WarehouseController.java +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/wh/controller/WarehouseController.java @@ -67,9 +67,4 @@ public class WarehouseController { public R> paging(PageParam pageParam, WarehouseEntity warehouseEntity) { return R.success(warehouseService.paging(pageParam, warehouseEntity)); } - - @GetMapping("/a") - public R a() { - return R.success(new WarehouseEntity()); - } } diff --git a/njzscloud-svr/src/main/java/com/njzscloud/dispose/wh/pojo/entity/WarehouseEntity.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/wh/pojo/entity/WarehouseEntity.java index 7a91e54..c1368cc 100644 --- a/njzscloud-svr/src/main/java/com/njzscloud/dispose/wh/pojo/entity/WarehouseEntity.java +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/wh/pojo/entity/WarehouseEntity.java @@ -1,9 +1,6 @@ package com.njzscloud.dispose.wh.pojo.entity; import com.baomidou.mybatisplus.annotation.*; -import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import com.njzscloud.common.core.ienum.DictKey; -import com.njzscloud.common.core.jackson.serializer.DictItemSerializer; import lombok.Getter; import lombok.Setter; import lombok.ToString; @@ -36,9 +33,7 @@ public class WarehouseEntity { /** * 仓库类型;raw_material-原料库,finished_product-成品库 */ - @DictKey("warehouse_type") - @JsonSerialize(using = DictItemSerializer.class) - private String type = "raw_material"; + private String type; /** * 所属站点 Id