From 9cf18114db306c5adc3f1e9ef8de27aa98db1d52 Mon Sep 17 00:00:00 2001
From: Andru <769883346@qq.com>
Date: 星期四, 14 十二月 2023 14:41:07 +0800
Subject: [PATCH] Merge branch 'master-prod-new' into master-test
---
phis-feign/src/main/java/com/hz/his/dto/order/OrderInfoDto.java | 9 +++++++--
phis-feign/src/main/java/com/hz/his/dto/micro/MicroRecordDto.java | 2 ++
2 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/phis-feign/src/main/java/com/hz/his/dto/micro/MicroRecordDto.java b/phis-feign/src/main/java/com/hz/his/dto/micro/MicroRecordDto.java
index 3230c59..f413d24 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/micro/MicroRecordDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/micro/MicroRecordDto.java
@@ -32,6 +32,8 @@
private String opRoleId;
/** 鍒拌璁㈠崟id */
private String visitOrderId;
+ /** 鏄惁鑽夌*/
+ private Integer isDraft;
private List<MicroPlanDto> planList;
}
diff --git a/phis-feign/src/main/java/com/hz/his/dto/order/OrderInfoDto.java b/phis-feign/src/main/java/com/hz/his/dto/order/OrderInfoDto.java
index 2442316..ae5268f 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/order/OrderInfoDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/order/OrderInfoDto.java
@@ -1,7 +1,5 @@
package com.hz.his.dto.order;
-import com.gitee.sunchenbin.mybatis.actable.annotation.Column;
-import com.gitee.sunchenbin.mybatis.actable.constants.MySqlTypeConstant;
import lombok.Data;
import java.math.BigDecimal;
@@ -41,4 +39,11 @@
/**澶勬柟璁㈠崟id*/
private String prescriptionId;
+ /**鍏宠仈鏍囪瘑绫诲瀷:0鑹捐姱鑽熶笓鍖�*/
+ private Integer relationType;
+ /**鍏宠仈鏍囪瘑*/
+ private String relationId;
+ /**鍏宠仈鍚嶇О*/
+ private String relationName;
+
}
--
Gitblit v1.8.0