新增字段

wujianwei

2025-08-15 5fe42ada08e210d6535289fcd3f913be7d3df189

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

@@ -167,21 +167,38 @@
    @Excel(name = "预估总收入")

        @TableField("estimated_total_income")
    private Long estimatedTotalIncome;
    private BigDecimal estimatedTotalIncome;


    /** 预估总成本 */
    @Excel(name = "预估总成本")

        @TableField("estimated_total_cost")
    private Long estimatedTotalCost;
    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 = "预估利润")

        @TableField("estimated_profit")
    private Long estimatedProfit;
    private BigDecimal estimatedProfit;


    /** 电子锁 */
@@ -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;