From 80af1ea4460da34eeb6c4f6d285168e2f24330b2 Mon Sep 17 00:00:00 2001
From: fhx <308050795@qq.com>
Date: 星期三, 01 十一月 2023 11:43:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-prod-new' into master-prod-new
---
phis-feign/src/main/java/com/hz/phis/dt/consumables/GoodsDetailDt.java | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/phis-feign/src/main/java/com/hz/phis/dt/consumables/GoodsDetailDt.java b/phis-feign/src/main/java/com/hz/phis/dt/consumables/GoodsDetailDt.java
index b92d257..a08b8de 100644
--- a/phis-feign/src/main/java/com/hz/phis/dt/consumables/GoodsDetailDt.java
+++ b/phis-feign/src/main/java/com/hz/phis/dt/consumables/GoodsDetailDt.java
@@ -12,7 +12,7 @@
* */
@Data
public class GoodsDetailDt extends BaseDt {
- /**绫诲瀷(1鍟嗗搧2鑽搧)*/
+ /**绫诲瀷(1鍟嗗搧2鑽搧3浼樻儬鍒�)*/
private Integer type;
/**缂栧彿*/
private String serialNumber;
@@ -172,4 +172,9 @@
private String bigTypeCode;
/**鑽搧澶х被鍚�*/
private String bigTypeName;
+
+ //鍏宠仈鏍囪瘑(绫诲瀷涓�3鍒欏叧鑱斾紭鎯犲埜id)
+ public String commonId;
+ //鍏戞崲绉垎
+ private BigDecimal integral;
}
--
Gitblit v1.8.0