Merge remote-tracking branch 'origin/tzskasrs' into tzskasrs

whycq

2023-10-18 bb5bb4094dfc9c4a691692d0275cb24bedbc732c

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

@@ -2,6 +2,7 @@

import com.zy.asrs.entity.AgvBasDevp;
import com.zy.asrs.entity.AgvWaitPakin;
import com.zy.asrs.entity.AgvWrkDetl;
import com.zy.asrs.entity.AgvWrkMast;
import lombok.Data;

@@ -15,4 +16,10 @@

    private AgvWaitPakin agvWaitPakin;

    private AgvWrkDetl agvWrkDetl;

    private boolean containerMoveOutFlag;

    private boolean pickInFlag;

}