Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop

skyouc

2025-04-01 875936724f2d82c6e3146f8f224bf0a26fced6c6

 rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/WaitPakinItem.java

@@ -47,7 +47,7 @@
     * 订单ID
     */
    @ApiModelProperty(value= "订单ID")
    private Long ansId;
    private Long asnId;

    /**
     * 订单编码
@@ -131,7 +131,6 @@
     * 是否删除 1: 是  0: 否  
     */
    @ApiModelProperty(value= "是否删除 1: 是  0: 否  ")
    @TableLogic
    private Integer deleted;

    /**