From 41dc0ffbb2b66fd6da78603adfadd5b574d0aab6 Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期六, 08 十月 2022 14:20:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComBatteryCommodityActivity.java | 26 +++++++++++++++++++++++++-
1 files changed, 25 insertions(+), 1 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComBatteryCommodityActivity.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComBatteryCommodityActivity.java
index 24a47c2..ddbe2df 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComBatteryCommodityActivity.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComBatteryCommodityActivity.java
@@ -87,7 +87,14 @@
* 更新人id
*/
private Long updateBy;
-
+ /**
+ * 活动商品已卖出数量
+ */
+ private Integer commoditySaleNum;
+ /**
+ * 商品规格id
+ */
+ private Long specsId;
/**
* 是否删除枚举（1.是 2.否）
*/
@@ -95,5 +102,22 @@
int YES = 1;
int NO = 2;
}
+ /**
+ * 状态（1.进行中 2.已下架 3.已结束）
+ */
+ public interface Status{
+ int JXZ = 1;
+ int YXJ = 2;
+ int YJS = 3;
+ }
+
+ /**
+ * 活动类型（1.拼团活动 2.砍价活动 3.限时秒杀）
+ */
+ public interface Type{
+ int PT = 1;
+ int KJ = 2;
+ int MS = 3;
+ }
}
--
Gitblit v1.7.1