From c1107fe385312f9a7b1d9d84c06aaf54e01440fa Mon Sep 17 00:00:00 2001
From: cmg <527198563@qq.com>
Date: 星期二, 14 五月 2024 15:27:12 +0800
Subject: [PATCH] Merge branch 'master-prod-new' into master-stander
---
crm-platform-feign/src/main/java/com/hz/crm/dto/coupon/CouponInfoDto.java | 11 +++++------
1 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/crm-platform-feign/src/main/java/com/hz/crm/dto/coupon/CouponInfoDto.java b/crm-platform-feign/src/main/java/com/hz/crm/dto/coupon/CouponInfoDto.java
index e32cb56..353ccc2 100644
--- a/crm-platform-feign/src/main/java/com/hz/crm/dto/coupon/CouponInfoDto.java
+++ b/crm-platform-feign/src/main/java/com/hz/crm/dto/coupon/CouponInfoDto.java
@@ -4,7 +4,6 @@
import lombok.Data;
import java.math.BigDecimal;
-import java.util.Date;
/**
* 浼樻儬鍒镐俊鎭�
@@ -60,13 +59,13 @@
/**鏈夋晥寮�濮嬫椂闂�*/
private String startTime;
/**鏈夋晥缁撴潫鏃堕棿*/
- private Date endTime;
+ private String endTime;
/**鏈夋晥鐘舵�侊紙0浣滃簾 1鏈夋晥锛�*/
private Integer validState;
/**寮�濮嬫椂闂达紙灞曠ず鍜岄鍙栵級*/
- private Date startShowTime;
+ private String startShowTime;
/**缁撴潫鏃堕棿锛堝睍绀哄拰棰嗗彇锛�*/
- private Date endShowTime;
+ private String endShowTime;
/**鏈夋晥澶╂暟*/
public Integer validDay;
/**鏄惁灞曠ず锛�0鍚�1鏄級*/
@@ -94,9 +93,9 @@
/**浼樻儬鍒告垚鏈儴闂�*/
private String couponCostDepartment;
/**鍙戣寮�濮嬫椂闂�*/
- private Date issueStartTime;
+ private String issueStartTime;
/**鍙戣缁撴潫鏃堕棿*/
- private Date issueEndTime;
+ private String issueEndTime;
/**鍙戣绫诲瀷锛�0绾夸笂 1绾夸笅锛�*/
private Integer issueType;
/**鍙戣鏁伴噺*/
--
Gitblit v1.8.0