diff --git a/bonus-common-biz/src/main/java/com/bonus/common/biz/enums/LeaseInfoEnum.java b/bonus-common-biz/src/main/java/com/bonus/common/biz/enums/LeaseInfoEnum.java
new file mode 100644
index 0000000..bb3cf7e
--- /dev/null
+++ b/bonus-common-biz/src/main/java/com/bonus/common/biz/enums/LeaseInfoEnum.java
@@ -0,0 +1,24 @@
+package com.bonus.common.biz.enums;
+
+import lombok.Getter;
+
+/**
+ * @author ma_sh
+ * @version : 1.0
+ * 租赁需求大厅状态枚举
+ */
+@Getter
+public enum LeaseInfoEnum {
+
+ LEASE_PENDING_ORDER(0, "待接单"),
+ LEASE_ORDER_RECEIVED(1, "已接单"),
+ LEASE_PAST_DUE(2, "已到期");
+
+ private final Integer status;
+ private final String statusName;
+
+ LeaseInfoEnum(Integer status, String statusName) {
+ this.status = status;
+ this.statusName = statusName;
+ }
+}
diff --git a/bonus-common-biz/src/main/java/com/bonus/common/biz/enums/LeaseTaskStatusEnum.java b/bonus-common-biz/src/main/java/com/bonus/common/biz/enums/LeaseTaskStatusEnum.java
deleted file mode 100644
index 5b7b8c6..0000000
--- a/bonus-common-biz/src/main/java/com/bonus/common/biz/enums/LeaseTaskStatusEnum.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package com.bonus.common.biz.enums;
-
-import lombok.Getter;
-
-/**
- * @author : 阮世耀
- * @version : 1.0
- * 领料任务状态枚举
- */
-@Getter
-public enum LeaseTaskStatusEnum {
-
- LEASE_TASK_TO_PUBLISHED(1, "待发布"),
- LEASE_TASK_TO_AUDIT(2, "待审核"),
- LEASE_TASK_IN_PROGRESS(3, "出库进行中"),
- LEASE_TASK_FINISHED(4, "出库已完成");
-
- private final Integer status;
- private final String statusName;
-
- LeaseTaskStatusEnum(Integer status, String statusName) {
- this.status = status;
- this.statusName = statusName;
- }
-}
diff --git a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/device/BmFileInfoMapper.xml b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/device/BmFileInfoMapper.xml
index adf345d..d86ee17 100644
--- a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/device/BmFileInfoMapper.xml
+++ b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/device/BmFileInfoMapper.xml
@@ -58,8 +58,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
#{taskType},
#{taskId},
#{modelId},
- #{name},
- #{url},
+ #{fileName},
+ #{fileUrl},
#{fileType},
#{createBy},
now()
@@ -89,8 +89,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
task_type = #{taskType},
task_id = #{taskId},
model_id = #{modelId},
- name = #{name},
- url = #{url},
+ name = #{fileName},
+ url = #{fileUrl},
file_type = #{fileType},
create_by = #{createBy},
update_time = now()