From 4607163342d0f3598748662eb3e41cacb708adc6 Mon Sep 17 00:00:00 2001
From: wangrenhuang <wangren_huang@163.com>
Date: 星期二, 28 二月 2023 11:45:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-prod-new' into master-prod-new

---
 phis-feign/src/main/java/com/hz/his/dto/card/CardBagDto.java |   27 +++++++++++++++++++++++++++
 1 files changed, 27 insertions(+), 0 deletions(-)

diff --git a/phis-feign/src/main/java/com/hz/his/dto/card/CardBagDto.java b/phis-feign/src/main/java/com/hz/his/dto/card/CardBagDto.java
new file mode 100644
index 0000000..cd2508f
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/dto/card/CardBagDto.java
@@ -0,0 +1,27 @@
+package com.hz.his.dto.card;
+
+import com.hz.his.dto.PageDto;
+import lombok.Data;
+
+/**
+ * 鍗″寘鎵╁睍
+ *
+ * @author fwq
+ */
+@Data
+public class CardBagDto extends PageDto {
+    /**鐢ㄦ埛鏍囪瘑*/
+    private String userId;
+    /**鍗″寘鏍囪瘑*/
+    private String cardBagId;
+    /**鎿嶄綔鍛樺伐鏍囪瘑*/
+    private String opEmployeeId;
+    /**鎿嶄綔闂ㄥ簵鏍囪瘑*/
+    private String opShopId;
+    /**寮�濮嬫椂闂�*/
+    private String startTime;
+    /**缁撴潫鏃堕棿*/
+    private String endTime;
+    /**澶囨敞*/
+    private String remarks;
+}

--
Gitblit v1.8.0