From 82c3f19b64db521d2a28c8e5fdae4cc37bdea628 Mon Sep 17 00:00:00 2001
From: zhangxu <3%usVi4iXbVkhI1c>
Date: 星期二, 01 十一月 2022 15:07:26 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

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

diff --git a/phis-feign/src/main/java/com/hz/his/dto/marketing/OrderCancelDto.java b/phis-feign/src/main/java/com/hz/his/dto/marketing/OrderCancelDto.java
index dea20b9..96c12a3 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/marketing/OrderCancelDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/marketing/OrderCancelDto.java
@@ -11,6 +11,4 @@
     /*******************蹇呭~椤�(娉ㄦ剰缁ф壙鐨勫叕鍏辩被MarketingDto)*************************/
     /**璁㈠崟鏍囪瘑*/
     private String orderId;
-    /**璁㈠崟鍙�*/
-    private String orderNo;
 }

--
Gitblit v1.8.0