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

yaowanxin

2 天以前 6f888b234148d1a4dbd1e6c28a8d9ed85ebfda09

 src/main/java/com/ruoyi/stock/pojo/StockOutRecord.java

@@ -29,7 +29,7 @@
    private static final long serialVersionUID = 1L;

    @TableId(value = "id", type = IdType.AUTO)
    private Integer id;
    private Long id;

    @ApiModelProperty("入库批次")
    private String outboundBatches;