From a42b02f3a71afcc0e1152e782ce7ffa541c1e1a9 Mon Sep 17 00:00:00 2001
From: zhouxiang <zhouxiang>
Date: 星期一, 05 九月 2022 11:46:40 +0800
Subject: [PATCH] Merge branch 'master' of http://1.15.4.62/r/~chenjiahe/phis-service-feign

---
 phis-feign/src/main/java/com/hz/phis/dt/promotion/PromotionDt.java |   23 +++++++++++------------
 1 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/phis-feign/src/main/java/com/hz/phis/dt/promotion/PromotionDt.java b/phis-feign/src/main/java/com/hz/phis/dt/promotion/PromotionDt.java
index fbc2485..8ec30bd 100644
--- a/phis-feign/src/main/java/com/hz/phis/dt/promotion/PromotionDt.java
+++ b/phis-feign/src/main/java/com/hz/phis/dt/promotion/PromotionDt.java
@@ -1,16 +1,15 @@
 package com.hz.phis.dt.promotion;
 
-/**淇冮攢鎵╁睍*/
+
+import lombok.Data;
+
+/**
+ * 淇冮攢璇︽儏瀹炰綋
+ *
+ * @author fwq
+ */
+@Data
 public class PromotionDt {
-
-    /**鏇存柊鏃堕棿*/
-    private String editTime;
-
-    public String getEditTime() {
-        return editTime;
-    }
-
-    public void setEditTime(String editTime) {
-        this.editTime = editTime;
-    }
+    private PromotionDeLimitDt promotion;
+    private String id;
 }

--
Gitblit v1.8.0