From 1b8ad0cc6a79f84fb32fdffae39742afa964748e Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期二, 24 九月 2024 16:09:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0' into 2.0
---
cloud-server-account/src/main/java/com/dsh/account/model/dto/Coupon.java | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/cloud-server-account/src/main/java/com/dsh/account/model/dto/Coupon.java b/cloud-server-account/src/main/java/com/dsh/account/model/dto/Coupon.java
index 2fae339..5b1dcf5 100644
--- a/cloud-server-account/src/main/java/com/dsh/account/model/dto/Coupon.java
+++ b/cloud-server-account/src/main/java/com/dsh/account/model/dto/Coupon.java
@@ -57,6 +57,7 @@
* 限领数量
*/
private Integer pickUpQuantity;
+ private Integer publisherType;
/**
* 开始时间
*/
@@ -105,6 +106,7 @@
* 状态（1=正常，2=冻结，3=删除）
*/
private Integer state;
+ private Integer cityManagerId;
/**
* 添加时间
*/
--
Gitblit v1.7.1