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

whycq

2024-04-10 2832d39ad91a6de161bf9b8f8e3307bf6bc7fb65

 src/main/java/com/zy/asrs/entity/param/CombParam.java

@@ -16,12 +16,18 @@
    // 托盘条码
    private String barcode;

    // 托盘条码
    private Short containerType;

    // 库位编号
    private String locno;

    // 库位类型： 1、待包装成品，2、原材料，3、箱壳
    private Integer locType;

    //第二单位数量
    private Double anfme;

    private List<CombMat> combMats;

    @Data