From f0da95925bcb8ad19b0d1cc78afe4b4a4ae188a6 Mon Sep 17 00:00:00 2001
From: p-honggang.li <p-honggang.li@pcitc.com>
Date: 星期四, 28 八月 2025 09:55:51 +0800
Subject: [PATCH] Merge branch 'master' of http://xearth.cn:6600/r/web-manage/web-manage-back
---
src/main/java/com/webmanage/entity/ProductPricing.java | 18 ++++++++++++------
1 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/webmanage/entity/ProductPricing.java b/src/main/java/com/webmanage/entity/ProductPricing.java
index 7c61271..0a0e03b 100644
--- a/src/main/java/com/webmanage/entity/ProductPricing.java
+++ b/src/main/java/com/webmanage/entity/ProductPricing.java
@@ -16,7 +16,7 @@
*/
@Data
@EqualsAndHashCode(callSuper = false)
-@TableName("product_pricing")
+@TableName("tb_product_pricing")
public class ProductPricing implements Serializable {
private static final long serialVersionUID = 1L;
@@ -70,10 +70,16 @@
private String priceUnit;
/**
- * 浠锋牸鍊�
+ * 璐у竵浠锋牸鍊�
*/
- @TableField("price")
- private BigDecimal price;
+ @TableField("currency_price")
+ private BigDecimal currencyPrice;
+
+ /**
+ * 绉垎浠峰��
+ */
+ @TableField("points_price")
+ private BigDecimal pointsPrice;
/**
* 鍚敤鐘舵��
@@ -85,7 +91,7 @@
* 鍏宠仈浜у搧ID
*/
@TableField("product_id")
- private Long productId;
+ private String productId;
/**
* 浜у搧鍚嶇О
@@ -97,7 +103,7 @@
* 浜у搧鎻愪緵鑰匢D
*/
@TableField("provider_id")
- private Long providerId;
+ private String providerId;
/**
* 浜у搧鎻愪緵鑰呭悕绉�
--
Gitblit v1.8.0