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

zss

22 小时以前 6ed4b397bb9dbb9c2d7bb0676339721fa97996bf

 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;