From c313a253b1fcdc75b6be5db575fc2b29fb407021 Mon Sep 17 00:00:00 2001
From: rk <94314517@qq.com>
Date: 星期三, 15 四月 2026 20:05:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 server/services/src/main/java/com/doumee/dao/dto/MyOrderDTO.java |   24 ++++++++++++++++++++++++
 1 files changed, 24 insertions(+), 0 deletions(-)

diff --git a/server/services/src/main/java/com/doumee/dao/dto/MyOrderDTO.java b/server/services/src/main/java/com/doumee/dao/dto/MyOrderDTO.java
new file mode 100644
index 0000000..ecca5c8
--- /dev/null
+++ b/server/services/src/main/java/com/doumee/dao/dto/MyOrderDTO.java
@@ -0,0 +1,24 @@
+package com.doumee.dao.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 灏忕▼搴忕-鎴戠殑璁㈠崟鏌ヨ璇锋眰
+ * @author rk
+ * @date 2026/04/15
+ */
+@Data
+@ApiModel("浼氬憳璁㈠崟鏌ヨ璇锋眰")
+public class MyOrderDTO implements Serializable {
+
+    @ApiModelProperty(value = "璁㈠崟鐘舵�侊紙鍙�夛紝涓嶄紶鏌ュ叏閮級", example = "0")
+    private Integer status;
+
+    @ApiModelProperty(value = "鍚堝苟鐘舵�侊紙鍙�夛紝涓嶄紶鏌ュ叏閮級: 0=寰呮敮浠� 1=寰呮牳楠� 2=寰呴厤閫� 3=寰呮敹璐� 4=宸插畬鎴� 5=閫�娆�", example = "0")
+    private Integer combinedStatus;
+
+}

--
Gitblit v1.9.3