From 9f53055abd60eb0fb5d8060587124012d77d8ab6 Mon Sep 17 00:00:00 2001
From: ANDRU-PC\Andru <769883346@qq.com>
Date: 星期四, 23 三月 2023 17:08:44 +0800
Subject: [PATCH] Merge branch 'master' into master-test

---
 phis-feign/src/main/java/com/hz/his/dto/order/OrderInfoDto.java |    7 +++++++
 1 files changed, 7 insertions(+), 0 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 9f20bc0..2442316 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,5 +1,7 @@
 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;
@@ -34,4 +36,9 @@
 
     /**鏄惁纭璁㈠崟*/
     private Integer isCustomerConfirm;
+    /**澶勬柟璁㈠崟鍙�*/
+    private String prescriptionNo;
+    /**澶勬柟璁㈠崟id*/
+    private String prescriptionId;
+
 }

--
Gitblit v1.8.0