Merge branch 'jtwy' into dev_New

zss

18 小时以前 fc830b7f62af651acedb8c11f1e2634fe2a3e497

 src/main/java/com/ruoyi/production/dto/SalesLedgerSchedulingDto.java

@@ -125,6 +125,9 @@
    @Excel(name = "状态")
    private String status;

    @Excel(name = "进度")
    private BigDecimal progress;

    @ApiModelProperty(value = "租户ID")
    private Long tenantId;