From c88d1658a2b6b51ed1a81c3be3e9102b661970f3 Mon Sep 17 00:00:00 2001
From: luoxinwu <934743099@qq.com>
Date: 星期二, 05 三月 2024 09:42:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/haucheng_panzhihua' into haucheng_panzhihua
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/VolunteerCreditsExchange.java | 35 +++++++++++++++++++++++++++++++++++
1 files changed, 35 insertions(+), 0 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/VolunteerCreditsExchange.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/VolunteerCreditsExchange.java
index 9d478fe..445ff45 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/VolunteerCreditsExchange.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/VolunteerCreditsExchange.java
@@ -113,5 +113,40 @@
@ApiModelProperty(value = "1 社区兑换订单 2商家商品购买订单")
private String orderType;
+ /**
+ * 商品数量
+ */
+ @ApiModelProperty(value = "实际支付积分")
+ private String palyIntegral;
+
+ /**
+ * 商品数量
+ */
+ @ApiModelProperty(value = "商家id")
+ private String merchantId;
+
+ /**
+ * 商品购买数量
+ */
+ @ApiModelProperty(value = "商品购买数量")
+ private String palyNum;
+
+ /**
+ * 是否评价 0未评价 1已评价
+ */
+ @ApiModelProperty(value = "是否评价 0未评价 1已评价")
+ private String isEvaluate;
+
+ /**
+ * 商家名称
+ */
+ @TableField(exist = false)
+ @ApiModelProperty(value = "商家名称")
+ private String merchantName;
+
+
+
+
+
}
--
Gitblit v1.7.1