From acccff9860b271d55c55dc87486f7c20b9896e6c Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期一, 13 一月 2025 16:19:54 +0800
Subject: [PATCH] 修改bug

---
 ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/PointSetting.java |   26 +++++++++-----------------
 1 files changed, 9 insertions(+), 17 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 df0ccbe..5c2b9bf 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,6 +7,7 @@
 import lombok.EqualsAndHashCode;
 
 import java.io.Serializable;
+import java.math.BigDecimal;
 import java.time.LocalDateTime;
 
 /**
@@ -31,7 +32,6 @@
 
     @ApiModelProperty(value = "删除标志(0=否,1=是)")
     @TableField("del_flag")
-    @TableLogic
     private Integer delFlag;
 
     @ApiModelProperty(value = "添加时间")
@@ -58,17 +58,9 @@
     @TableField("regis_point")
     private Integer regisPoint;
 
-    @ApiModelProperty(value = "注册积分 1开0关")
-    @TableField("regis_point_open")
-    private Integer regisPointOpen;
-
-    @ApiModelProperty(value = "注册积分转赠送 1开0关")
-    @TableField("regis_point_gift")
-    private Integer regisPointGift;
-
     @ApiModelProperty(value = "消费积分")
     @TableField("buy_point")
-    private Integer buyPoint;
+    private BigDecimal buyPoint;
 
     @ApiModelProperty(value = "消费积分积分 1开0关")
     @TableField("buy_point_open")
@@ -80,7 +72,7 @@
 
     @ApiModelProperty(value = "返佣积分")
     @TableField("share_point")
-    private Integer sharePoint;
+    private BigDecimal sharePoint;
 
     @ApiModelProperty(value = "返佣积分 1开0关")
     @TableField("share_point_open")
@@ -92,7 +84,7 @@
 
     @ApiModelProperty(value = "门店返佣积分")
     @TableField("shop_share_point")
-    private Integer shopSharePoint;
+    private BigDecimal shopSharePoint;
 
     @ApiModelProperty(value = "门店返佣积分 1开0关")
     @TableField("shop_share_point_open")
@@ -104,7 +96,7 @@
 
     @ApiModelProperty(value = "门店业绩积分")
     @TableField("shop_point")
-    private Integer shopPoint;
+    private BigDecimal shopPoint;
 
     @ApiModelProperty(value = "门店业绩积分 1开0关")
     @TableField("shop_point_open")
@@ -116,7 +108,7 @@
 
     @ApiModelProperty(value = "技师业绩积分")
     @TableField("person_point")
-    private Integer personPoint;
+    private BigDecimal personPoint;
 
     @ApiModelProperty(value = "技师业绩积分 1开0关")
     @TableField("person_point_open")
@@ -128,7 +120,7 @@
 
     @ApiModelProperty(value = "拉新人积分")
     @TableField("get_new_point")
-    private Integer getNewPoint;
+    private BigDecimal getNewPoint;
 
     @ApiModelProperty(value = "拉新人积分 1开0关")
     @TableField("get_new_point_open")
@@ -140,7 +132,7 @@
 
     @ApiModelProperty(value = "注册积分")
     @TableField("get_regis_point")
-    private Integer getRegisPoint;
+    private BigDecimal getRegisPoint;
 
     @ApiModelProperty(value = "注册积分 1开0关")
     @TableField("get_regis_point_open")
@@ -152,7 +144,7 @@
 
     @ApiModelProperty(value = "做工积分")
     @TableField("work_point")
-    private Integer workPoint;
+    private BigDecimal workPoint;
 
     @ApiModelProperty(value = "做工积分 1开0关")
     @TableField("work_point_open")

--
Gitblit v1.7.1