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

liyong

2 天以前 60806825951c111ac107dec87bd3acc5a7d6a707

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

@@ -62,4 +62,9 @@
    @ApiModelProperty(value = "修改用户")
    @TableField(fill = FieldFill.INSERT_UPDATE)
    private Integer updateUser;

    @ApiModelProperty("过磅日期")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private LocalDateTime weighingDate;
}