From 2bbf2a6d0b13772aa5254cb9e9271bd2e41d4061 Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期一, 30 九月 2024 18:47:53 +0800
Subject: [PATCH] Merge branch 'master-stander' into master-jiayan
---
phis-feign/src/main/java/com/hz/his/dto/quotation/QuotationItemDto.java | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/phis-feign/src/main/java/com/hz/his/dto/quotation/QuotationItemDto.java b/phis-feign/src/main/java/com/hz/his/dto/quotation/QuotationItemDto.java
index 021241f..77ad379 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/quotation/QuotationItemDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/quotation/QuotationItemDto.java
@@ -5,6 +5,7 @@
import lombok.Data;
import java.math.BigDecimal;
+import java.util.List;
/**
* 鎶ヤ环鍗曞瓙椤筪to
@@ -18,11 +19,7 @@
private String id;
/** 鍏宠仈绫诲瀷 */
- private String relateType;
- /** 鍏宠仈鏍囪瘑(閫傚簲鐥�/鏍囩) */
- private String relateId;
- /** 鍏宠仈鍚嶇О(鍐椾綑) */
- private String relateName;
+ private String assocType;
/** 鍟嗗搧绫诲瀷(OrderItemConstants) */
@Column(comment = "", length = 20, type = MySqlTypeConstant.VARCHAR,isNull = false)
@@ -50,6 +47,9 @@
/** 璐拱鏁伴噺 */
private Integer buyNum;
+ /** 澶氬叧鑱斾俊鎭� */
+ private List<QuotationItemAssocDto> itemAssocList;
+
public QuotationItemDto() {
}
}
--
Gitblit v1.8.0