From 2e5ec4c7c528437a20fd7212096dedd26ed0f5cd Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期二, 02 九月 2025 15:36:09 +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, 2 insertions(+), 2 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..866f966 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
@@ -41,11 +41,11 @@
@ApiModelProperty(value = "底薪")
@TableField("base_salary")
- private Double baseSalary;
+ private BigDecimal baseSalary;
@ApiModelProperty(value = "差旅补助")
@TableField("travel_allowance")
- private Double travelAllowance;
+ private BigDecimal travelAllowance;
}
--
Gitblit v1.7.1