Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/haizhentong

liujie

2025-09-05 505e5244eeaa4968fc666d3cd12e5a43db20b043

 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;
}