From 6e7d6c0ea933d16f527b56f25916507ed01dcdce Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期五, 20 十二月 2024 09:57:00 +0800
Subject: [PATCH] 合并代码
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/vo/AuthPassStatus.java | 18 ++++++++++++++++++
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/vo/ConfirmDelivery.java | 18 ++++++++++++++++++
2 files changed, 36 insertions(+), 0 deletions(-)
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/vo/AuthPassStatus.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/vo/AuthPassStatus.java
new file mode 100644
index 0000000..df71cd4
--- /dev/null
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/vo/AuthPassStatus.java
@@ -0,0 +1,18 @@
+package com.ruoyi.order.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author zhibing.pu
+ * @date 2024/12/19 14:49
+ */
+@Data
+public class AuthPassStatus {
+ @ApiModelProperty("售后数据id")
+ private Long id;
+ @ApiModelProperty("审核状态（2=同意，3=拒绝）")
+ private Integer status;
+ @ApiModelProperty("审核备注")
+ private String passRemark;
+}
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/vo/ConfirmDelivery.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/vo/ConfirmDelivery.java
new file mode 100644
index 0000000..f310c4f
--- /dev/null
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/vo/ConfirmDelivery.java
@@ -0,0 +1,18 @@
+package com.ruoyi.order.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author zhibing.pu
+ * @date 2024/12/19 14:22
+ */
+@Data
+@ApiModel
+public class ConfirmDelivery {
+ @ApiModelProperty("订单id")
+ private Long orderId;
+ @ApiModelProperty("快递json信息{\"com\":\"shunfeng\",\"num\":\"123456\"}")
+ private String code;
+}
--
Gitblit v1.7.1