From d621324bcf6c5a26f058b24e0f4d2930f41840f4 Mon Sep 17 00:00:00 2001
From: rx <auster_i@163.com>
Date: 星期一, 05 八月 2024 18:45:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-base' into master-prod-new
---
phis-feign/src/main/java/com/hz/his/dto/order/OrderItemIntegralVo.java | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/phis-feign/src/main/java/com/hz/his/dto/order/OrderItemIntegralVo.java b/phis-feign/src/main/java/com/hz/his/dto/order/OrderItemIntegralVo.java
index e2c0dc7..0714acc 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/order/OrderItemIntegralVo.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/order/OrderItemIntegralVo.java
@@ -11,12 +11,12 @@
*/
@Data
public class OrderItemIntegralVo {
- /**蹇呭～ 鍘熺Н鍒�*/
+ /**蹇呭～ 鍘熶环绉垎*/
private BigDecimal originalIntegral;
- /**蹇呭～ 閿�鍞Н鍒�*/
+ /**蹇呭～ 鍞环绉垎*/
private BigDecimal saleIntegral;
- /**蹇呭～ 鍘熸�荤Н鍒�*/
+ /**蹇呭～ 鍘熶环鎬荤Н鍒�*/
private BigDecimal originalTotal;
- /**蹇呭～ 閿�鍞�荤Н鍒�*/
+ /**蹇呭～ 鍞环鎬荤Н鍒�*/
private BigDecimal saleTotal;
}
--
Gitblit v1.8.0