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

yuan

22 小时以前 fb40c4dfec5954c321f38bb86e9d07eb87b97bfd

 src/main/java/com/ruoyi/stock/dto/StockInRecordDto.java

@@ -25,4 +25,10 @@

    //现存量
    private String currentStock;

    //订单
    private String npsNo;

    //工单
    private String workOrderNo;
}