Merge remote-tracking branch 'origin/master'

yyt

2024-01-23 d86d6a6dca39eff9cbd9073c9e23e58308864e51

 jcdm-main/src/main/java/com/jcdm/main/bs/orderScheduling/domain/BsOrderScheduling.java

@@ -5,6 +5,8 @@
import com.jcdm.common.annotation.Excel;
import com.jcdm.common.core.domain.BaseEntity;

import java.util.Date;

/**
 * 订单排产对象 bs_order_scheduling
 * 
@@ -120,6 +122,78 @@

    private String endTime;

    /** 合箱上线时间 */
    @Excel(name = "合箱上线时间")
    private Date boxClosingOnlineTime;

    /** 合箱下线时间 */
    @Excel(name = "合箱下线时间")
    private Date closingBoxOfflineTime;

    /** 总装上线时间 */
    @Excel(name = "总装上线时间")
    private Date finalAssemblyLaunchTime;

    /** 总装下线时间 */
    @Excel(name = "总装下线时间")
    private Date finalAssemblyOfflineTime;

    /** CVT上线时间 */
    @Excel(name = "CVT上线时间")
    private Date cvtLaunchTime;

    /** CVT下线时间 */
    @Excel(name = "CVT下线时间")
    private Date cvtOfflineTime;

    public Date getBoxClosingOnlineTime() {
        return boxClosingOnlineTime;
    }

    public void setBoxClosingOnlineTime(Date boxClosingOnlineTime) {
        this.boxClosingOnlineTime = boxClosingOnlineTime;
    }

    public Date getClosingBoxOfflineTime() {
        return closingBoxOfflineTime;
    }

    public void setClosingBoxOfflineTime(Date closingBoxOfflineTime) {
        this.closingBoxOfflineTime = closingBoxOfflineTime;
    }

    public Date getFinalAssemblyLaunchTime() {
        return finalAssemblyLaunchTime;
    }

    public void setFinalAssemblyLaunchTime(Date finalAssemblyLaunchTime) {
        this.finalAssemblyLaunchTime = finalAssemblyLaunchTime;
    }

    public Date getFinalAssemblyOfflineTime() {
        return finalAssemblyOfflineTime;
    }

    public void setFinalAssemblyOfflineTime(Date finalAssemblyOfflineTime) {
        this.finalAssemblyOfflineTime = finalAssemblyOfflineTime;
    }

    public Date getCvtLaunchTime() {
        return cvtLaunchTime;
    }

    public void setCvtLaunchTime(Date cvtLaunchTime) {
        this.cvtLaunchTime = cvtLaunchTime;
    }

    public Date getCvtOfflineTime() {
        return cvtOfflineTime;
    }

    public void setCvtOfflineTime(Date cvtOfflineTime) {
        this.cvtOfflineTime = cvtOfflineTime;
    }

    public String[] getDateConditions() {
        return dateConditions;
    }