From db07d8230cf1f18c0ee73312618d8e90b69945b4 Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期一, 29 四月 2024 17:15:43 +0800
Subject: [PATCH] Merge branch 'master-fwq-积分抵扣现金' into master-test
---
phis-feign/src/main/java/com/hz/his/dto/order/OrderInfoDto.java | 2 +-
1 files changed, 1 insertions(+), 1 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 14869dd..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
@@ -44,6 +44,6 @@
/**鍏宠仈鏍囪瘑*/
private String relationId;
/**鍏宠仈鍚嶇О*/
- private Integer relationName;
+ private String relationName;
}
--
Gitblit v1.8.0