diff --git a/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/OaDeliveryOrder.java b/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/OaDeliveryOrder.java
index caa334a..abc9153 100644
--- a/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/OaDeliveryOrder.java
+++ b/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/OaDeliveryOrder.java
@@ -101,4 +101,8 @@ public class OaDeliveryOrder extends BaseEntity {
*/
private String remark;
+
+ //状态和附件
+ private Integer status;
+ private String accessory;
}
diff --git a/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/bo/OaDeliveryOrderBo.java b/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/bo/OaDeliveryOrderBo.java
index 0e95049..95df584 100644
--- a/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/bo/OaDeliveryOrderBo.java
+++ b/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/bo/OaDeliveryOrderBo.java
@@ -124,4 +124,9 @@ public class OaDeliveryOrderBo extends BaseEntity {
@DateTimeFormat(pattern = "yyyy-MM-dd")
private Date endTime;
+
+ //状态和附件
+ private Integer status;
+ private String accessory;
+
}
diff --git a/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/OaDeliveryOrderVo.java b/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/OaDeliveryOrderVo.java
index 31f4f22..4fe24dc 100644
--- a/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/OaDeliveryOrderVo.java
+++ b/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/OaDeliveryOrderVo.java
@@ -136,4 +136,9 @@ public class OaDeliveryOrderVo {
private String projectNum;
+ //状态和附件
+ private Integer status;
+ private String accessory;
+
+
}
diff --git a/ruoyi-oa/src/main/resources/mapper/oa/OaDeliveryOrderMapper.xml b/ruoyi-oa/src/main/resources/mapper/oa/OaDeliveryOrderMapper.xml
index 3d57cf2..8d09336 100644
--- a/ruoyi-oa/src/main/resources/mapper/oa/OaDeliveryOrderMapper.xml
+++ b/ruoyi-oa/src/main/resources/mapper/oa/OaDeliveryOrderMapper.xml
@@ -22,6 +22,8 @@
+
+
@@ -48,6 +50,8 @@
odo.actual_receiver AS actualReceiver,
odo.construction_company AS constructionCompany,
odo.delivery_remark AS deliveryRemark,
+ odo.status AS status,
+ odo.accessory AS accessory,
p.project_name AS projectName,
p.project_code AS projectCode,
p.project_num AS projectNum