From b95f5fb1af8a80ac03a8da8da3e863ad468bf477 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期六, 13 九月 2025 14:58:17 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-system/src/main/java/com/ruoyi/system/model/TCrmSalesperson.java | 3 ++-
1 files changed, 2 insertions(+), 1 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 697f79d..d9a76f7 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,5 +1,6 @@
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;
@@ -32,7 +33,7 @@
@ApiModelProperty(value = "后台用户id")
@TableField("user_id")
- private Integer userId;
+ private Long userId;
@ApiModelProperty(value = "业务员名称")
@TableField("salesperson_name")
--
Gitblit v1.7.1