Merge remote-tracking branch 'origin/dev_tide' into dev_tide

liding

6 天以前 1284fb157043e488aa1794d8f1b64ebf18aa5147

 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;

    /**