Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/haizhentong

liujie

3 天以前 283ea8cfd97f225d0451d57bf915e6f3a0f2041b

 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;