Merge remote-tracking branch 'origin/master'

xuhy

4 天以前 d72d88f9e19ead4bbc2f69c4f5fbe66b1edbdc31

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