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

zc

2024-11-01 797fce4ad48f7b70dc08766068b64f35ee9d4775

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

@@ -35,6 +35,16 @@

    private String zpallet;

    //"matnr", "batch", "outOrderNo", "luHao", "packing", "sPgNO", "proType" color
    private String outOrderNo;

    private String luHao;

    private String packing;

    private String proType;

    private String color;

    public LocDto() {
    }