From f18b35727a11a5f8b5e326f6045f49b571954ba3 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期一, 09 六月 2025 11:02:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev

---
 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/dto/PayOrderDto.java |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/dto/PayOrderDto.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/dto/PayOrderDto.java
index ad43d21..cfc9ff3 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/dto/PayOrderDto.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/dto/PayOrderDto.java
@@ -13,6 +13,8 @@
     private String id;
     @ApiModelProperty("1充电订单2购物订单3vip订单4停车订单")
     private Integer type;
+    @ApiModelProperty("站点id")
+    private Integer siteId;
     @ApiModelProperty("订单编号")
     private String code;
     @ApiModelProperty("订单标题")

--
Gitblit v1.7.1