合并代码，解决冲突

zhangchao

2024-11-04 c28e6101a5e42a9cdcc51ef6b69599ea15fe2af9

 src/main/java/com/zy/common/model/AgvBasDevpDto.java

@@ -16,8 +16,12 @@

    private AgvWrkMast agvWrkMast;

    private AgvWaitPakin agvWaitPakin;

    private List<AgvWaitPakin> agvWaitPakins;

    private AgvWrkDetl agvWrkDetl;

    private List<AgvWrkDetl> agvWrkDetls;

    private boolean containerMoveOutFlag;