From bf1b71ad55ea8a272bae824461ce8b99b410fc23 Mon Sep 17 00:00:00 2001
From: sxu <602087911@qq.com>
Date: Wed, 11 Dec 2024 15:00:31 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8D=95=E7=8B=AC=E9=80=80=E7=A7=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/bonus/material/order/domain/OrderInfoDto.java     | 3 +++
 .../main/resources/mapper/material/order/OrderInfoMapper.xml   | 1 +
 2 files changed, 4 insertions(+)

diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/domain/OrderInfoDto.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/domain/OrderInfoDto.java
index 67dd2f1..5efa218 100644
--- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/domain/OrderInfoDto.java
+++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/domain/OrderInfoDto.java
@@ -17,6 +17,9 @@ public class OrderInfoDto {
     @ApiModelProperty(value = "主键id")
     private Integer orderId;
 
+    @ApiModelProperty(value = "设备id")
+    private Integer maId;
+
     @ApiModelProperty(value = "订单装备套数")
     private Integer maNumber;
 
diff --git a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/order/OrderInfoMapper.xml b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/order/OrderInfoMapper.xml
index 2b79b15..be342c8 100644
--- a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/order/OrderInfoMapper.xml
+++ b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/order/OrderInfoMapper.xml
@@ -91,6 +91,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         su.phonenumber AS phoneNumber,
         moi.address,
         moi.order_id,
+        hh.ma_id as maId,
         sum(hh.costs) cost,
         dept.dept_name as companyName
         FROM