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

zss

6 天以前 01d728d8aa257c5601039030f16ba0213bc6e501

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

@@ -42,7 +42,7 @@
    private String recordType;

    @ApiModelProperty("产品规格id")
    private Integer productModelId;
    private Long productModelId;

    @ApiModelProperty("备注")
    private String remark;