From 1b6aaa7d6c379ccdb0870a36f848c1f811577bf0 Mon Sep 17 00:00:00 2001 From: fwq <582742538@qq.com> Date: 星期三, 24 四月 2024 17:24:20 +0800 Subject: [PATCH] Merge branch 'master-fwq-积分抵扣现金' 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