Merge branch 'master' of https://gitee.com/luxiaotao1123/zy-asrs into hylyasrs

18516761980

2022-06-15 15dc5e53f4ba7fe72cc0f3d3a246a9599fa52acf

 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