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

liyong

9 天以前 516a98353f103b44b87a36251cffaf5df8a8f7bc

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

@@ -36,7 +36,7 @@
    private BigDecimal stockOutNum;

    @ApiModelProperty("入库来源id")
    private Integer recordId;
    private Long recordId;

    @ApiModelProperty("入库类型")
    private String recordType;