From b5a63b29313463d1c2fd1b5678a2d6b2bb8a7044 Mon Sep 17 00:00:00 2001
From: jiaosong <jiaosong6760@dingtalk.com>
Date: 星期五, 18 八月 2023 19:33:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 server/src/main/java/doumeemes/dao/ext/vo/MaterialDistributeExtListVO.java |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/server/src/main/java/doumeemes/dao/ext/vo/MaterialDistributeExtListVO.java b/server/src/main/java/doumeemes/dao/ext/vo/MaterialDistributeExtListVO.java
index 472f306..21d9c27 100644
--- a/server/src/main/java/doumeemes/dao/ext/vo/MaterialDistributeExtListVO.java
+++ b/server/src/main/java/doumeemes/dao/ext/vo/MaterialDistributeExtListVO.java
@@ -139,4 +139,8 @@
     @ApiModelProperty(value = "鍒嗙被灏忕被id")
     private Integer cmodel3Id;
 
+    @ApiModelProperty(value = "鏄惁鏈塨om锛�0=鏃狅紱1=鏈�")
+    private Integer hasBom;
+
+
 }

--
Gitblit v1.9.3