Merge branch 'phyzasrs-erp' into phyzasrs-erp-4

zhangc

2024-12-23 dcc9b7294a7f47c00445d2b8dec0097b6b3b0e5e

 src/main/java/com/zy/asrs/entity/WaitPakinLog.java

@@ -16,7 +16,7 @@

    private static final long serialVersionUID = 1L;

    @ApiModelProperty(value= "托盘条码")
    @ApiModelProperty(value= "货架条码")
    private String zpallet;

    @ApiModelProperty(value= "数量")
@@ -26,7 +26,7 @@
    @TableField("loc_no")
    private String locNo;

    @ApiModelProperty(value= "单据号")
    @ApiModelProperty(value= "物料号")
    private String matnr;

    @ApiModelProperty(value= "物料号")