From 34e64f1437ed897056bed0c3851e7a46ac220423 Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期四, 18 九月 2025 18:01:57 +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/TCrmSalesperson.java | 10 +++++++---
1 files changed, 7 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..2adf0ac 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
@@ -1,13 +1,16 @@
package com.ruoyi.system.model;
+import cn.afterturn.easypoi.excel.annotation.Excel;
import com.baomidou.mybatisplus.annotation.*;
import com.ruoyi.common.core.domain.BaseModel;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
+import org.hibernate.validator.constraints.Length;
import java.io.Serializable;
+import java.math.BigDecimal;
import java.time.LocalDateTime;
/**
@@ -31,12 +34,13 @@
@ApiModelProperty(value = "后台用户id")
@TableField("user_id")
- private Integer userId;
+ private Long userId;
@ApiModelProperty(value = "业务员名称")
@TableField("salesperson_name")
private String salespersonName;
+ @Length(max = 11, message = "手机号长度不能超过11个字符")
@ApiModelProperty(value = "手机号")
@TableField("phone")
private String phone;
@@ -47,11 +51,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