Merge branch 'refs/heads/dev_New' into dev_New_kthg

liding

20 小时以前 1a3f5db043fd381b60a0a5f40687136274a2cbd1

 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;