Merge remote-tracking branch 'origin/yagwly_fa_master' into yagwly_fa_master

wujianwei

2025-08-18 3d3fa72ebf55f841c8ede01c59347af5e44b773b

 service/src/main/java/com/ruoyi/cwgl/domain/PendingSettlementBusiness.java

@@ -176,6 +176,23 @@
        @TableField("estimated_total_cost")
    private BigDecimal estimatedTotalCost;

    /** 确认总收入 */
    @Excel(name = "确认总收入")
    @TableField("confirmed_total_income")
    private BigDecimal confirmedTotalIncome;
    /** 确认总成本 */
    @Excel(name = "确认总成本")
    @TableField("confirmed_total_cost")
    private BigDecimal confirmedTotalCost;

    /**是否匹配收入(0:未匹配;1:已匹配)*/
    @TableField("is_income_matched")
    private Integer isIncomeMatched;

    /**是否匹配成本(0:未匹配;1:已匹配)*/
    @TableField("is_cost_matched")
    private Integer isCostMatched;


    /** 预估利润 */
    @Excel(name = "预估利润")
@@ -364,6 +381,22 @@
        /**业务id修改用*/
        @TableField(exist = false)
     private Integer serviceId;
    /**
     * 是否生成过入账0否1是
     */
    @TableField("is_create")
    private Integer isCreate;
    /**
     * 关联账单id
     */
    @TableField("bill_id")
    private Integer billId;

    /**
     * 关联账单id
     */
    @TableField("bill_name")
    private String billName;

    public String getActualDepartureTimeBegin() {
        return actualDepartureTimeBegin;