Merge remote-tracking branch 'origin/master'

xuhy

3 天以前 8635f0ece99df340535466e9b6207c6ecf1b8a4d

 ruoyi-system/src/main/java/com/ruoyi/system/model/TErpSupplierWarehousingBatch.java

@@ -54,5 +54,8 @@
    @TableField("expiry_date")
    private LocalDateTime expiryDate;

    @TableField(exist = false)
    private String goodsId;


}