Merge remote-tracking branch 'origin/master'

sgj

2 天以前 d491a7503e9b33f26afa39834d8c456a673607bb

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

@@ -17,8 +17,16 @@

    private String id;

    public String title;

    public String unit;

    public String timeDesc;

    private String progress;

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

    private String weightTag;

    private String type;