Merge remote-tracking branch 'origin/master'

xuhy

3 天以前 00957f0c836b80d9052a6ccf673d3b454b646081

 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;