From e290789c592db88cfbffac7ecbdcd8f998e45796 Mon Sep 17 00:00:00 2001
From: jiaosong <jiaosong6760@dingtalk.com>
Date: 星期一, 28 八月 2023 11:36:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 server/src/main/java/doumeemes/dao/ext/dto/QueryMaterialDistributeExtDTO.java |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/server/src/main/java/doumeemes/dao/ext/dto/QueryMaterialDistributeExtDTO.java b/server/src/main/java/doumeemes/dao/ext/dto/QueryMaterialDistributeExtDTO.java
index 9aa3e8f..50bb3c4 100644
--- a/server/src/main/java/doumeemes/dao/ext/dto/QueryMaterialDistributeExtDTO.java
+++ b/server/src/main/java/doumeemes/dao/ext/dto/QueryMaterialDistributeExtDTO.java
@@ -273,6 +273,8 @@
 
     @ApiModelProperty(value = "鍒嗙被灏忕被id")
     private Integer cmodel3Id;
+    @ApiModelProperty(value = "鏌ヨ鏍囪瘑 1鏌ヨ宸ヨ壓璺嚎宸ュ簭" ,example = "0")
+    private Integer queryType;
 
 
     @ApiModelProperty(value = "鐗╂枡缂栫爜ids 閫楀彿鍒嗗壊")

--
Gitblit v1.9.3