Merge remote-tracking branch 'origin/master'

sgj

2 天以前 d491a7503e9b33f26afa39834d8c456a673607bb

 fzzy-igdss-core/src/main/java/com/fzzy/igds/domain/Quantity.java

@@ -78,5 +78,6 @@
    private String remark;

    @Transient
    @TableField(exist = false)
    private Depot depotData;
}