合并代码，解决冲突

zhangchao

2024-11-04 c28e6101a5e42a9cdcc51ef6b69599ea15fe2af9

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

@@ -10,7 +10,7 @@
@Data
public class FullStoreParam {

    // 托盘条码
    // 货架条码
    private String barcode;

    // 站点编号