From 1d6f916b5254a31a086f897acb0d4a5913a3e332 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期四, 11 九月 2025 14:59:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-system/src/main/java/com/ruoyi/system/model/TCrmSalesperson.java | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/model/TCrmSalesperson.java b/ruoyi-system/src/main/java/com/ruoyi/system/model/TCrmSalesperson.java
index 2a1e7fe..2485364 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/model/TCrmSalesperson.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/model/TCrmSalesperson.java
@@ -8,6 +8,7 @@
import lombok.EqualsAndHashCode;
import java.io.Serializable;
+import java.math.BigDecimal;
import java.time.LocalDateTime;
/**
@@ -31,7 +32,7 @@
@ApiModelProperty(value = "后台用户id")
@TableField("user_id")
- private Integer userId;
+ private Long userId;
@ApiModelProperty(value = "业务员名称")
@TableField("salesperson_name")
@@ -47,11 +48,11 @@
@ApiModelProperty(value = "百分比分佣")
@TableField("money_commission")
- private Double moneyCommission;
+ private BigDecimal moneyCommission;
@ApiModelProperty(value = "积分获得限制")
@TableField("points_commission")
- private Double pointsCommission;
+ private BigDecimal pointsCommission;
@ApiModelProperty(value = "用户积分")
@TableField("user_points")
--
Gitblit v1.7.1