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

lsh

2 天以前 3041eb1b0b76b75b916939e77c7ae97a80fe5af3

 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