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

zyx

2023-08-04 d55581ed00fd0a8ecce78a6ebe6f9e2ee86274b3

 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,6 @@

    private AgvWaitPakin agvWaitPakin;

    private AgvWrkDetl agvWrkDetl;

}