master
parent
0a782e2d45
commit
7eea4fb8e9
|
|
@ -67,9 +67,4 @@ public class WarehouseController {
|
||||||
public R<PageResult<WarehouseResult>> paging(PageParam pageParam, WarehouseEntity warehouseEntity) {
|
public R<PageResult<WarehouseResult>> paging(PageParam pageParam, WarehouseEntity warehouseEntity) {
|
||||||
return R.success(warehouseService.paging(pageParam, warehouseEntity));
|
return R.success(warehouseService.paging(pageParam, warehouseEntity));
|
||||||
}
|
}
|
||||||
|
|
||||||
@GetMapping("/a")
|
|
||||||
public R<?> a() {
|
|
||||||
return R.success(new WarehouseEntity());
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,9 +1,6 @@
|
||||||
package com.njzscloud.dispose.wh.pojo.entity;
|
package com.njzscloud.dispose.wh.pojo.entity;
|
||||||
|
|
||||||
import com.baomidou.mybatisplus.annotation.*;
|
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.Getter;
|
||||||
import lombok.Setter;
|
import lombok.Setter;
|
||||||
import lombok.ToString;
|
import lombok.ToString;
|
||||||
|
|
@ -36,9 +33,7 @@ public class WarehouseEntity {
|
||||||
/**
|
/**
|
||||||
* 仓库类型;raw_material-原料库,finished_product-成品库
|
* 仓库类型;raw_material-原料库,finished_product-成品库
|
||||||
*/
|
*/
|
||||||
@DictKey("warehouse_type")
|
private String type;
|
||||||
@JsonSerialize(using = DictItemSerializer.class)
|
|
||||||
private String type = "raw_material";
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 所属站点 Id
|
* 所属站点 Id
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue