From 940dd1b292db4c5cc2df2f137fa46c37f2159898 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期四, 05 十二月 2024 18:06:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/PointSetting.java |    4 ++--
 1 files changed, 2 insertions(+), 2 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 c6bb0be..15a7069 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
@@ -105,7 +105,7 @@
 
     @ApiModelProperty(value = "门店业绩积分")
     @TableField("shop_point")
-    private BigDecimal shopPoint;
+    private Integer shopPoint;
 
     @ApiModelProperty(value = "门店业绩积分 1开0关")
     @TableField("shop_point_open")
@@ -129,7 +129,7 @@
 
     @ApiModelProperty(value = "拉新人积分")
     @TableField("get_new_point")
-    private BigDecimal getNewPoint;
+    private Integer getNewPoint;
 
     @ApiModelProperty(value = "拉新人积分 1开0关")
     @TableField("get_new_point_open")

--
Gitblit v1.7.1