Merge branch 'dev_tide' into dev_tide_gybjyhglxt

zouyu

2 天以前 0b0b8419586505154a7e57e7c32c9a44329347ce

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

@@ -17,7 +17,7 @@
    @ApiModelProperty(value = "销售台账ID")
    private Long salesLedgerId;

    @ApiModelProperty(value = "销售产品ID")
    @ApiModelProperty(value = "生产订单ID")
    private Long salesLedgerProductId;

    /**