From 4fa212add5bb7689331e9e070c802bfcb5dcafa2 Mon Sep 17 00:00:00 2001
From: rain <1679827795@qq.com>
Date: Mon, 02 Feb 2026 17:21:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 drone-service/drone-gd/src/main/java/org/sxkj/gd/implement/vo/GdMaterialVO.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drone-service/drone-gd/src/main/java/org/sxkj/gd/implement/vo/GdMaterialVO.java b/drone-service/drone-gd/src/main/java/org/sxkj/gd/implement/vo/GdMaterialVO.java
index ec99323..921a1e7 100644
--- a/drone-service/drone-gd/src/main/java/org/sxkj/gd/implement/vo/GdMaterialVO.java
+++ b/drone-service/drone-gd/src/main/java/org/sxkj/gd/implement/vo/GdMaterialVO.java
@@ -54,7 +54,7 @@
 	 * 是否适用全部情形：1是 0否
 	 */
 	@ApiModelProperty(value = "是否适用全部情形：1是 0否")
-	private Byte isAllScenario;
+	private Integer isAllScenario;
 	/**
 	 * 材料说明
 	 */

--
Gitblit v1.9.3