From d057f70a60c8c066838bd0d0779ffbaa9a16c1ab Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期五, 18 十一月 2022 17:43:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into master-test
---
phis-feign/src/main/java/com/hz/his/dto/user/project/UserProjectDto.java | 9 +++++++++
1 files changed, 9 insertions(+), 0 deletions(-)
diff --git a/phis-feign/src/main/java/com/hz/his/dto/user/project/UserProjectDto.java b/phis-feign/src/main/java/com/hz/his/dto/user/project/UserProjectDto.java
index 85934fe..c794249 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/user/project/UserProjectDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/user/project/UserProjectDto.java
@@ -13,6 +13,7 @@
private String userId;
/**鍟嗗搧绫诲瀷锛歱roject椤圭洰goods鍟嗗搧card鍗￠」*/
private String type;
+
/**鍟嗗搧缂栧彿*/
private String goodsNo;
/**鍟嗗搧鏍囪瘑*/
@@ -27,6 +28,14 @@
private String orderItemNo;
/**璁㈠崟鍙�*/
private String orderId;
+ /**鐘舵��*/
+ private Integer status;
+ //鏄惁SPA(0:鍚�,1:鏄�)
+ private Integer isSpa;
+
+
+ //鐢ㄦ埛鎵�灞炲瓙椤圭洰id(UserProjectItem)
+ private String userProjectItemId;
}
--
Gitblit v1.8.0