Merge remote-tracking branch 'origin/wms-dev' into wms-dev

ZY

2024-09-25 2191824072549f0da35d73686a075e59b0196321

 zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/param/OrderOutMergeParam.java

@@ -2,10 +2,11 @@

import lombok.Data;

import java.io.Serializable;
import java.util.List;

@Data
public class OrderOutMergeParam {
public class OrderOutMergeParam implements Serializable {

    private Long locId;