Merge remote-tracking branch 'origin/dev_衡阳_鹏创电子' into dev_衡阳_鹏创电子

yuan

10 小时以前 fb40c4dfec5954c321f38bb86e9d07eb87b97bfd

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

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

    /**
     * 规格型号