From 9574cd990b7e32f966edc45824f8f952b5215d58 Mon Sep 17 00:00:00 2001
From: ANDRU-PC\Andru <769883346@qq.com>
Date: 星期二, 18 七月 2023 19:58:49 +0800
Subject: [PATCH] Merge branch 'master' into master-test

---
 phis-feign/src/main/java/com/hz/his/dto/order/PayAmountDto.java |   19 ++++++++++++++-----
 1 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/phis-feign/src/main/java/com/hz/his/dto/order/PayAmountDto.java b/phis-feign/src/main/java/com/hz/his/dto/order/PayAmountDto.java
index 91e40a7..a92147a 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/order/PayAmountDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/order/PayAmountDto.java
@@ -11,14 +11,23 @@
  */
 @Data
 public class PayAmountDto {
-    //瀹為檯鏀粯閲戦
+    /**蹇呭~ 瀹為檯鏀粯閲戦*/
     private String amount;
-    //鏀粯鏂瑰紡
+    /**蹇呭~ 鏀粯鏂瑰紡*/
     private String method;
-    //鍟嗗搧/椤圭洰id/缁勫悎椤规爣璇�(鍗¢」鏀粯鏃跺繀浼犵粍鍚堥」鏍囪瘑)
+    /**蹇呭~ 鍟嗗搧/椤圭洰id/缁勫悎椤规爣璇�(鍗¢」鏀粯鏃跺繀浼犵粍鍚堥」鏍囪瘑)*/
     private String commonId;
-    //鏉冪泭绫诲瀷:鍗¢」鏀粯蹇呬紶
+
+    /**闈炲繀濉� 鏉冪泭绫诲瀷:鍗¢」鏀粯蹇呬紶*/
     private String cardEquityId;
-    //鍗″寘鏍囪瘑:鍗¢」鏀粯蹇呬紶
+    /**闈炲繀濉� 鍗″寘鏍囪瘑:鍗¢」鏀粯蹇呬紶*/
     private String userCardId;
+
+    /**
+     * 鏍囪瀛楁锛岄粯璁�0
+     * 鏀粯鏂瑰紡涓虹Н鍒嗘椂锛�
+     * isDel=100锛屽垯phis杩欒竟闇�瑕佹墸鍑忕敤鎴风Н鍒�
+     * isDel=101锛屽垯phis杩欒竟涓嶉渶瑕佹墸鍑忕敤鎴风Н鍒�
+     */
+    private Integer isDel = 0;
 }

--
Gitblit v1.8.0