Merge remote-tracking branch 'origin/master'

xuhy

2025-09-03 0838f85fa74b36638adf2621bc2f49a345982dec

 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,11 @@

    @ApiModelProperty(value = "底薪")
    @TableField("base_salary")
    private Double baseSalary;
    private BigDecimal baseSalary;

    @ApiModelProperty(value = "差旅补助")
    @TableField("travel_allowance")
    private Double travelAllowance;
    private BigDecimal travelAllowance;


}