合并代码，解决冲突

zhangchao

2024-11-04 c28e6101a5e42a9cdcc51ef6b69599ea15fe2af9

 src/main/java/com/zy/common/web/param/ReplenishmentParam.java

@@ -4,7 +4,7 @@

@Data
public class ReplenishmentParam {
    //容器编码
    //货架编码
    private String containerCode;
    //agv站点
    private String devNo;