From 3664ff0935aeab26d23926331333a1f55caea1c1 Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Mon, 19 Jan 2026 15:23:21 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 drone-service/drone-gd/src/main/java/org/sxkj/gd/orderdata/excel/GdSupplyDemandAuditExcel.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drone-service/drone-gd/src/main/java/org/sxkj/gd/orderdata/excel/GdSupplyDemandAuditExcel.java b/drone-service/drone-gd/src/main/java/org/sxkj/gd/orderdata/excel/GdSupplyDemandAuditExcel.java
index f3285a1..05d8b95 100644
--- a/drone-service/drone-gd/src/main/java/org/sxkj/gd/orderdata/excel/GdSupplyDemandAuditExcel.java
+++ b/drone-service/drone-gd/src/main/java/org/sxkj/gd/orderdata/excel/GdSupplyDemandAuditExcel.java
@@ -46,7 +46,7 @@
 	 */
 	@ColumnWidth(20)
 	@ExcelProperty("关联供需需求表ID")
-	private Integer demandId;
+	private Long demandId;
 	/**
 	 * 审核结果(0待审核 1通过 2驳回)
 	 */

--
Gitblit v1.9.3