From 28e8b38e9de8cc76084d0af6a96d2d9d1e1f739f Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期四, 27 十月 2022 13:28:32 +0800
Subject: [PATCH] Merge branch 'local_20221024' into haucheng_panzhihua
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComBatteryCommodityOrderCollageTeam.java | 13 ++++++++++---
1 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComBatteryCommodityOrderCollageTeam.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComBatteryCommodityOrderCollageTeam.java
index 4f2d228..82f36d4 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComBatteryCommodityOrderCollageTeam.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComBatteryCommodityOrderCollageTeam.java
@@ -21,7 +21,7 @@
/**
* 活动id
*/
- private Long acctivityId;
+ private Long activityId;
/**
* 订单id
*/
@@ -42,7 +42,14 @@
* 创建时间
*/
private Date createAt;
-
-
+ /**
+ * 状态（1.等待拼团 2.拼团成功 3.拼团失败 4.已退款）
+ */
+ public interface Status{
+ int DDPT = 1;
+ int PTCG = 2;
+ int PTSB = 3;
+ int YTK = 4;
+ }
}
--
Gitblit v1.7.1