Merge remote-tracking branch 'origin/master'

czt

3 天以前 dfd2060bdcc0de929b4770a6a4a580c17bd72104

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

@@ -19,6 +19,10 @@

    private String progress;

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

    private String weightTag;

    private String type;

    private String foodVariety;