From f18a802137a7642473891f6886d44cf0c229efed Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期六, 11 一月 2025 18:09:10 +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, 7 insertions(+), 16 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..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
@@ -32,7 +32,6 @@
@ApiModelProperty(value = "删除标志（0=否，1=是）")
@TableField("del_flag")
- @TableLogic
private Integer delFlag;
@ApiModelProperty(value = "添加时间")
@@ -41,31 +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;
-
- @ApiModelProperty(value = "注册积分 1开0关")
- @TableField("regis_point_open")
- private Integer regisPointOpen;
-
- @ApiModelProperty(value = "注册积分转赠送 1开0关")
- @TableField("regis_point_gift")
- private Integer regisPointGift;
+ private Integer regisPoint;
@ApiModelProperty(value = "消费积分")
@TableField("buy_point")
@@ -105,7 +96,7 @@
@ApiModelProperty(value = "门店业绩积分")
@TableField("shop_point")
- private Integer shopPoint;
+ private BigDecimal shopPoint;
@ApiModelProperty(value = "门店业绩积分 1开0关")
@TableField("shop_point_open")
@@ -129,7 +120,7 @@
@ApiModelProperty(value = "拉新人积分")
@TableField("get_new_point")
- private Integer getNewPoint;
+ private BigDecimal getNewPoint;
@ApiModelProperty(value = "拉新人积分 1开0关")
@TableField("get_new_point_open")
--
Gitblit v1.7.1