Merge branch 'jtwy' into dev_New

zss

昨天 be09cd5461ee9e2589ed833510ac6a2a52ded6f3

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

@@ -26,4 +26,7 @@
    private String unit;


    //生产订单号
    @ApiModelProperty(value = "生产订单号")
    private String productOrderNpsNo;
}