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

gongchunyi

2 天以前 f81364e8bfbede8de723c708eee8060cb2c63b83

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

@@ -43,6 +43,11 @@
     * 生产炒机
     */
    private String speculativeTradingName;
    /**
     * 产线
     */
    @ApiModelProperty(value = "产线")
    private String productionLine;

    /**
     * 规格型号