From 155905061b3aa29d2aa23e5693e8704debfb9828 Mon Sep 17 00:00:00 2001
From: wangrenhuang <wangren_huang@163.com>
Date: 星期一, 06 十一月 2023 16:36:06 +0800
Subject: [PATCH] Merge branch 'master' into master-test
---
phis-feign/src/main/java/com/hz/his/dto/user/project/UserProjectDto.java | 10 +++++++++-
1 files changed, 9 insertions(+), 1 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..1b43d90 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,7 +28,14 @@
private String orderItemNo;
/**璁㈠崟鍙�*/
private String orderId;
-
+ /**鐘舵��*/
+ private Integer status;
+ /**鏄惁SPA(0:鍚�,1:鏄�)*/
+ private Integer isSpa;
+ /**鐢ㄦ埛鎵�灞炲瓙椤圭洰id(UserProjectItem)*/
+ private String userProjectItemId;
+ /**鏄惁澶勭悊钄″尰鐢熷悕绉�*/
+ private Integer handlerDoctorName = 0;
}
--
Gitblit v1.8.0