Merge remote-tracking branch 'origin/master'

hdy

2024-01-18 2cc5a1afe8296d148f0a32989395d538e5323a8e

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

@@ -110,7 +110,49 @@
    @Excel(name = "备注")
    private String remarks;

    public void setId(Long id) 
    /** CVT报工 */
    @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;
    }

    public void setReport30(String report30) {
        this.report30 = report30;
    }

    public void setId(Long id)
    {
        this.id = id;
    }