From b89aa0f1954342ebac40bd5dfb3adb390fb5a862 Mon Sep 17 00:00:00 2001
From: wangrenhuang <wangren_huang@163.com>
Date: 星期四, 20 四月 2023 19:18:04 +0800
Subject: [PATCH] Merge branch 'master' into master-test

---
 phis-feign/src/main/java/com/hz/phis/dt/promotion/PromotionDt.java |   22 +++++++++++-----------
 1 files changed, 11 insertions(+), 11 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 75c2ed8..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,15 +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