Merge remote-tracking branch 'origin/master'

czt

7 天以前 b1e6bf7d3ed1a1d64182127f83fdc3fad2233a7e

 fzzy-igdss-core/src/main/java/com/fzzy/igds/data/InoutParam.java

@@ -19,6 +19,8 @@

    private String progress;

    private String progressTag; //表示未完成的单据

    private String weightTag;

    private String type;