From bde85e957a1034ebee0edd1e4d440c0dfbdcfe19 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期五, 05 九月 2025 14:26:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-system/src/main/java/com/ruoyi/system/model/TCrmBranchSalary.java | 5 ++++-
1 files changed, 4 insertions(+), 1 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 866f966..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>
@@ -47,5 +48,7 @@
@TableField("travel_allowance")
private BigDecimal travelAllowance;
-
+ @ApiModelProperty(value = "职位名称")
+ @TableField(exist = false)
+ private String positionName;
}
--
Gitblit v1.7.1