Merge branch 'jsxswms' of http://47.97.1.152:5880/r/zy-asrs into jsxswms

skyouc

6 天以前 4ad955ed562ce9add346779791f8678b55b8c2a8

 src/main/java/com/zy/common/model/MesCombParam.java

@@ -15,11 +15,18 @@
    private String zpallet;

    // 帮托时间
    private String combTime;
    private String pakinTime;

    // 仓库编号 - 写死
    private String lgort;

    // 新增
    private String plantCode;

    private String fromCode;

    private String stationCode;

    private List<Detl> list = new ArrayList<>();

    @Data