From 60b34ecad3b960032568f26b2574ca09f901e500 Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期一, 11 九月 2023 15:19:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-prod-new' into master-prod-new

---
 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