From 8e8f1bd4d6290f8c4bf4d98a1b282b01f706e10b Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期四, 16 十月 2025 13:56:53 +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/TCrmBranchSalary.java | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/model/TCrmBranchSalary.java b/ruoyi-system/src/main/java/com/ruoyi/system/model/TCrmBranchSalary.java
index ce41558..61922ca 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/model/TCrmBranchSalary.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/model/TCrmBranchSalary.java
@@ -11,6 +11,7 @@
import lombok.EqualsAndHashCode;
import java.io.Serializable;
+import java.math.BigDecimal;
/**
* <p>
@@ -41,11 +42,13 @@
@ApiModelProperty(value = "底薪")
@TableField("base_salary")
- private Double baseSalary;
+ private BigDecimal baseSalary;
@ApiModelProperty(value = "差旅补助")
@TableField("travel_allowance")
- private Double travelAllowance;
+ private BigDecimal travelAllowance;
-
+ @ApiModelProperty(value = "职位名称")
+ @TableField(exist = false)
+ private String positionName;
}
--
Gitblit v1.7.1