Merge remote-tracking branch 'origin/master'

懒羊羊

2024-01-18 ba2d06afaf5bb9992d810d3c5fea38886e89a8f0

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

@@ -114,6 +114,36 @@
    @Excel(name = "CVT报工")
    private String report30;

    private String[] dateConditions;

    private String startTime;

    private String endTime;

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

    public void setDateConditions(String[] dateConditions) {
        this.dateConditions = dateConditions;
    }

    public String getStartTime() {
        return startTime;
    }

    public void setStartTime(String startTime) {
        this.startTime = startTime;
    }

    public String getEndTime() {
        return endTime;
    }

    public void setEndTime(String endTime) {
        this.endTime = endTime;
    }

    public String getReport30() {
        return report30;
    }