From 87a9aade5539d7be459059ab07566af148b40a0e Mon Sep 17 00:00:00 2001
From: zhouxiang <zhouxiang>
Date: 星期三, 28 十二月 2022 19:04:50 +0800
Subject: [PATCH] Merge branch '禅道号268-新的优惠券使用规则-叠加券' into master-prod-new
---
phis-feign/src/main/java/com/hz/his/dto/material/ConsumablesDto.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/phis-feign/src/main/java/com/hz/his/dto/material/ConsumablesDto.java b/phis-feign/src/main/java/com/hz/his/dto/material/ConsumablesDto.java
index f772818..0eab036 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/material/ConsumablesDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/material/ConsumablesDto.java
@@ -45,7 +45,7 @@
/** 鍗曚綅 蹇呭～*/
private String unit;
- /** 鐗╄祫绫诲瀷锛堝晢鍝�/鑽搧锛� */
+ /** 鐗╄祫绫诲瀷锛堝晢鍝�/鑽搧锛� 蹇呭～*/
private String type;
/**绫诲瀷- 鍟嗗搧*/
--
Gitblit v1.8.0