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

liyong

8 天以前 516a98353f103b44b87a36251cffaf5df8a8f7bc

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

@@ -28,10 +28,10 @@
    @ApiModelProperty(value = "入库数量")
    private BigDecimal stockInNum;

    @ApiModelProperty(value = "记录类型")
    @ApiModelProperty(value = "记录类型  采购入库/生产入库/质量入库/自定义入库")
    private String recordType;

    @ApiModelProperty(value = "记录ID")
    @ApiModelProperty(value = "记录ID  salesProductId/ProductrMainId/qualityInspectId/0")
    private Long recordId;

    @ApiModelProperty(value = "产品规格ID")