Merge remote-tracking branch 'origin/master'

Pu Zhibing

2025-05-09 8580866e175ad0050ee9c5ea3f757856fc242c39

 UserOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/Company.java

@@ -253,7 +253,45 @@
     */
    @TableField("insertTime")
    private Date insertTime;
    /**
     * 司机接单限制
     */
    @TableField("driverRestriction")
    private Double driverRestriction;
    /**
     * 固定费用
     */
    @TableField("fixedDeduction")
    private Double fixedDeduction;
    /**
     * 线上下单扣除
     */
    @TableField("percentageDeduction")
    private Double percentageDeduction;

    public Double getFixedDeduction() {
        return fixedDeduction;
    }

    public void setFixedDeduction(Double fixedDeduction) {
        this.fixedDeduction = fixedDeduction;
    }

    public Double getPercentageDeduction() {
        return percentageDeduction;
    }

    public void setPercentageDeduction(Double percentageDeduction) {
        this.percentageDeduction = percentageDeduction;
    }

    public Double getDriverRestriction() {
        return driverRestriction;
    }

    public void setDriverRestriction(Double driverRestriction) {
        this.driverRestriction = driverRestriction;
    }
    public Integer getId() {
        return id;
    }