From 97d7e38d0d0dc419672f9a6dbb12ac0e7f145553 Mon Sep 17 00:00:00 2001
From: rx <auster_i@163.com>
Date: 星期二, 24 十月 2023 17:55:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/rx-1023-营销优惠券新版' into master-test

---
 phis-feign/src/main/java/com/hz/his/dto/order/CardItemInfoDto.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/phis-feign/src/main/java/com/hz/his/dto/order/CardItemInfoDto.java b/phis-feign/src/main/java/com/hz/his/dto/order/CardItemInfoDto.java
index ea7148e..ca3f5b5 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/order/CardItemInfoDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/order/CardItemInfoDto.java
@@ -12,7 +12,7 @@
 @Data
 public class CardItemInfoDto {
     /**
-     * 浣跨敤娆℃暟
+     * 璐拱鍟嗗搧鏁伴噺锛屾敞鎰忥細涓嶆槸鎶垫墸娆℃暟
      */
     private Integer userNum;
     /**

--
Gitblit v1.8.0