diff --git a/.run/eqc-monitor-admin.run.xml b/.run/eqc-monitor-admin.run.xml index 2ab271b..eaf63ff 100644 --- a/.run/eqc-monitor-admin.run.xml +++ b/.run/eqc-monitor-admin.run.xml @@ -2,7 +2,7 @@ - diff --git a/.run/eqc-server.run.xml b/.run/eqc-server.run.xml index 2205adb..fa6eeb5 100644 --- a/.run/eqc-server.run.xml +++ b/.run/eqc-server.run.xml @@ -2,7 +2,7 @@ - diff --git a/.run/eqc-xxl-job-admin.run.xml b/.run/eqc-xxl-job-admin.run.xml index dd4e5a7..c6ce6c2 100644 --- a/.run/eqc-xxl-job-admin.run.xml +++ b/.run/eqc-xxl-job-admin.run.xml @@ -2,7 +2,7 @@ - diff --git a/script/sql/eqcs.sql b/script/sql/eqcs.sql index 47a0ad1..75e0812 100644 --- a/script/sql/eqcs.sql +++ b/script/sql/eqcs.sql @@ -29,7 +29,7 @@ CREATE TABLE `equipment_consumables` ( `validity` int DEFAULT NULL COMMENT '使用期效', `validity_uint` varchar(16) DEFAULT '' COMMENT '使用期效单位', `charge_user` bigint DEFAULT NULL COMMENT '负责人,到期后通知其更换', - `status` int DEFAULT NULL COMMENT '状态 0正在使用,1已报废 2未使用过', + `status` varchar(16) DEFAULT '' COMMENT '状态 0正在使用,1已报废 2未使用过', `create_by` varchar(64) DEFAULT '' COMMENT '创建者', `create_time` datetime DEFAULT NULL COMMENT '创建时间', `update_by` varchar(64) DEFAULT '' COMMENT '更新者', diff --git a/system/src/main/java/com/eqc/system/domain/EquipmentConsumables.java b/system/src/main/java/com/eqc/system/domain/EquipmentConsumables.java index d3cf18b..e478db0 100644 --- a/system/src/main/java/com/eqc/system/domain/EquipmentConsumables.java +++ b/system/src/main/java/com/eqc/system/domain/EquipmentConsumables.java @@ -60,7 +60,7 @@ public class EquipmentConsumables extends BaseEntity { /** * 状态 0正在使用,1已报废 2未使用过 */ - private Long status; + private String status; /** * 备注 */ diff --git a/system/src/main/java/com/eqc/system/domain/bo/EquipmentConsumablesBo.java b/system/src/main/java/com/eqc/system/domain/bo/EquipmentConsumablesBo.java index b45232a..c41efde 100644 --- a/system/src/main/java/com/eqc/system/domain/bo/EquipmentConsumablesBo.java +++ b/system/src/main/java/com/eqc/system/domain/bo/EquipmentConsumablesBo.java @@ -75,7 +75,7 @@ public class EquipmentConsumablesBo extends BaseEntity { * 状态 0正在使用,1已报废 2未使用过 */ @NotNull(message = "状态 0正在使用,1已报废 2未使用过不能为空", groups = { AddGroup.class, EditGroup.class }) - private Long status; + private String status; /** * 备注 diff --git a/system/src/main/java/com/eqc/system/domain/vo/EquipmentConsumablesVo.java b/system/src/main/java/com/eqc/system/domain/vo/EquipmentConsumablesVo.java index f31db07..bbb311c 100644 --- a/system/src/main/java/com/eqc/system/domain/vo/EquipmentConsumablesVo.java +++ b/system/src/main/java/com/eqc/system/domain/vo/EquipmentConsumablesVo.java @@ -75,7 +75,7 @@ public class EquipmentConsumablesVo implements Serializable { * 状态 0正在使用,1已报废 2未使用过 */ @ExcelProperty(value = "状态 0正在使用,1已报废 2未使用过") - private Long status; + private String status; /** * 备注