Merge remote-tracking branch 'origin/master'

sgj

22 小时以前 ef7cde2fb1f44de1ffa8b961ee1732fb327e1cd4

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

@@ -17,6 +17,12 @@

    private String id;

    public String title;

    public String unit;

    public String timeDesc;

    private String progress;

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