Merge remote-tracking branch 'origin/tzskasrs' into tzskasrs

Junjie

2023-10-16 9f3f31e66b2ffb217155b9bcd294da4ec12b6e34

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

@@ -20,6 +20,13 @@
    // 仓库编号 - 写死
    private String lgort;

    // 新增
    private String plantCode;

    private String fromCode;

    private String stationCode;

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

    @Data