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

maven

昨天 55c4143362c7df1ece4523597e26947d35e21bda

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

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


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