From ff811ae8df41273d7ab0011b6b7f1f278f03bbd2 Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期四, 12 十二月 2024 18:06:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/PointSetting.java | 23 +++++++++++------------
1 files changed, 11 insertions(+), 12 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/PointSetting.java b/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/PointSetting.java
index 15a7069..df0ccbe 100644
--- a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/PointSetting.java
+++ b/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/PointSetting.java
@@ -7,7 +7,6 @@
import lombok.EqualsAndHashCode;
import java.io.Serializable;
-import java.math.BigDecimal;
import java.time.LocalDateTime;
/**
@@ -41,23 +40,23 @@
@ApiModelProperty(value = "拉新人积分")
@TableField("new_point")
- private BigDecimal newPoint;
+ private Integer newPoint;
@ApiModelProperty(value = "每日分享积分")
@TableField("every_share_point")
- private BigDecimal everySharePoint;
+ private Integer everySharePoint;
@ApiModelProperty(value = "每日签到积分")
@TableField("sign_point")
- private BigDecimal signPoint;
+ private Integer signPoint;
@ApiModelProperty(value = "使用一小时积分")
@TableField("hour_point")
- private BigDecimal hourPoint;
+ private Integer hourPoint;
@ApiModelProperty(value = "注册积分")
@TableField("regis_point")
- private BigDecimal regisPoint;
+ private Integer regisPoint;
@ApiModelProperty(value = "注册积分 1开0关")
@TableField("regis_point_open")
@@ -69,7 +68,7 @@
@ApiModelProperty(value = "消费积分")
@TableField("buy_point")
- private BigDecimal buyPoint;
+ private Integer buyPoint;
@ApiModelProperty(value = "消费积分积分 1开0关")
@TableField("buy_point_open")
@@ -81,7 +80,7 @@
@ApiModelProperty(value = "返佣积分")
@TableField("share_point")
- private BigDecimal sharePoint;
+ private Integer sharePoint;
@ApiModelProperty(value = "返佣积分 1开0关")
@TableField("share_point_open")
@@ -93,7 +92,7 @@
@ApiModelProperty(value = "门店返佣积分")
@TableField("shop_share_point")
- private BigDecimal shopSharePoint;
+ private Integer shopSharePoint;
@ApiModelProperty(value = "门店返佣积分 1开0关")
@TableField("shop_share_point_open")
@@ -117,7 +116,7 @@
@ApiModelProperty(value = "技师业绩积分")
@TableField("person_point")
- private BigDecimal personPoint;
+ private Integer personPoint;
@ApiModelProperty(value = "技师业绩积分 1开0关")
@TableField("person_point_open")
@@ -141,7 +140,7 @@
@ApiModelProperty(value = "注册积分")
@TableField("get_regis_point")
- private BigDecimal getRegisPoint;
+ private Integer getRegisPoint;
@ApiModelProperty(value = "注册积分 1开0关")
@TableField("get_regis_point_open")
@@ -153,7 +152,7 @@
@ApiModelProperty(value = "做工积分")
@TableField("work_point")
- private BigDecimal workPoint;
+ private Integer workPoint;
@ApiModelProperty(value = "做工积分 1开0关")
@TableField("work_point_open")
--
Gitblit v1.7.1