From 505e5244eeaa4968fc666d3cd12e5a43db20b043 Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期五, 05 九月 2025 16:20:41 +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 | 4 +++-
1 files changed, 3 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 a5ae37a..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
@@ -48,5 +48,7 @@
@TableField("travel_allowance")
private BigDecimal travelAllowance;
-
+ @ApiModelProperty(value = "职位名称")
+ @TableField(exist = false)
+ private String positionName;
}
--
Gitblit v1.7.1