From c9a112ea32e72aacd025f2ecb3024e72528c2e0c Mon Sep 17 00:00:00 2001
From: ANDRU-PC\Andru <769883346@qq.com>
Date: 星期四, 09 三月 2023 10:40:53 +0800
Subject: [PATCH] Merge branch 'master' into master-test

---
 phis-feign/src/main/java/com/hz/his/dto/user/project/UserProjectDto.java |    7 +++++++
 1 files changed, 7 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 af8a0c6..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;
     /**鍟嗗搧鏍囪瘑*/
@@ -29,6 +30,12 @@
     private String orderId;
     /**鐘舵��*/
     private Integer status;
+   //鏄惁SPA(0:鍚�,1:鏄�)
+    private Integer isSpa;
+
+
+    //鐢ㄦ埛鎵�灞炲瓙椤圭洰id(UserProjectItem)
+    private String userProjectItemId;
 
 }
 

--
Gitblit v1.8.0