From a40429e0df56c94fecd29dbfb4c99cf2d393a1a8 Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期五, 05 九月 2025 11:14:09 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/haizhentong
---
ruoyi-system/src/main/java/com/ruoyi/system/model/TCrmBranch.java | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/model/TCrmBranch.java b/ruoyi-system/src/main/java/com/ruoyi/system/model/TCrmBranch.java
index 11792a3..0561aed 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/model/TCrmBranch.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/model/TCrmBranch.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("branch_name")
@@ -46,12 +47,12 @@
private String phone;
@ApiModelProperty(value = "百分比分佣")
- @TableField("money_commiss")
- private Double moneyCommiss;
+ @TableField("money_commission")
+ private BigDecimal moneyCommission;
@ApiModelProperty(value = "积分获得限制")
- @TableField("points_commiss")
- private Double pointsCommiss;
+ @TableField("points_commission")
+ private BigDecimal pointsCommission;
@ApiModelProperty(value = "用户积分")
@TableField("user_points")
--
Gitblit v1.7.1