From e74dade001072c3a0e93cd6d698df4df2262f5a3 Mon Sep 17 00:00:00 2001
From: chenjiahe <763432473@qq.com>
Date: 星期四, 01 八月 2024 22:30:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-base' into master-test

---
 phis-feign/src/main/java/com/hz/his/dto/order/OrderInfoDto.java |    9 +++++++--
 1 files changed, 7 insertions(+), 2 deletions(-)

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