From c980c8c2cd9403393db6a3f42705612a0a4d4511 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期一, 16 十二月 2024 15:49:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/Shop.java | 13 +++++++------
1 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/Shop.java b/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/Shop.java
index 788932a..37a518d 100644
--- a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/Shop.java
+++ b/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/Shop.java
@@ -96,27 +96,27 @@
@ApiModelProperty(value = "门店积分总数")
@TableField("shop_all_point")
- private BigDecimal shopAllPoint;
+ private Integer shopAllPoint;
@ApiModelProperty(value = "门店业绩积分")
@TableField("shop_point")
- private BigDecimal shopPoint;
+ private Integer shopPoint;
@ApiModelProperty(value = "门店返佣积分")
@TableField("share_point")
- private BigDecimal sharePoint;
+ private Integer sharePoint;
@ApiModelProperty(value = "门店服务积分")
@TableField("server_point")
- private BigDecimal serverPoint;
+ private Integer serverPoint;
@ApiModelProperty(value = "下级门店返佣积分")
@TableField("lower_level_rebate_points")
- private BigDecimal lowerLevelRebatePoints;
+ private Integer lowerLevelRebatePoints;
@ApiModelProperty(value = "门店已用积分")
@TableField("use_point")
- private BigDecimal usePoint;
+ private Integer usePoint;
@ApiModelProperty(value = "门店分佣总金额")
@TableField("giveaway_all_money")
@@ -164,4 +164,5 @@
private LocalDateTime createTime;
+
}
--
Gitblit v1.7.1