diff --git a/jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/model/equipment/EquipmentPagination.java b/jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/model/equipment/EquipmentPagination.java index cd5904e..3cfe2a4 100644 --- a/jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/model/equipment/EquipmentPagination.java +++ b/jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/model/equipment/EquipmentPagination.java @@ -32,7 +32,7 @@ public class EquipmentPagination extends Pagination { private String eqStatus; @Schema(description = "责任部门id") - private Integer deptId; + private String deptId; @Schema(description = "产线id") private Integer lineId; diff --git a/jnpf-java-boot/jnpf-web/src/views/example/equipment/index.vue b/jnpf-java-boot/jnpf-web/src/views/example/equipment/index.vue index 7ecbe8b..61163bb 100644 --- a/jnpf-java-boot/jnpf-web/src/views/example/equipment/index.vue +++ b/jnpf-java-boot/jnpf-web/src/views/example/equipment/index.vue @@ -38,24 +38,24 @@ - - - - - - - - + + + + + + + + + + + + 查询 @@ -77,6 +77,7 @@ :data="list" @selection-change="handleSelectionChange"> + @@ -87,7 +88,6 @@ - @@ -122,6 +122,7 @@