Merge remote-tracking branch 'origin/master'

xuhy

4 天以前 d72d88f9e19ead4bbc2f69c4f5fbe66b1edbdc31

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

@@ -54,6 +54,7 @@
    @TableField("expiry_date")
    private LocalDateTime expiryDate;

    @TableField(exist = false)
    private String goodsId;