Merge remote-tracking branch 'origin/master'

sgj

7 天以前 824d4e6be22a1d101897bf1be575bb5e3ed33845

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

@@ -107,12 +107,4 @@
    @TableField("is_only_th")
    private String isOnlyTH = Constant.YN_N;

    // 仓库名称
    @Transient
    private String depotName;

    //仓库类型
    @Transient
    private String depotType;

}