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

whycq

2024-05-29 265483cb46b5e951e3f6f9b6ed4ecdc94e6b371d

 src/main/java/com/zy/asrs/entity/BasDevp.java

@@ -117,9 +117,9 @@
    private Integer wrkNo1;

    /**
     * 容器类型
     * 货架类型
     */
    @ApiModelProperty(value= "容器类型")
    @ApiModelProperty(value= "货架类型")
    @TableField("ctn_type")
    private Integer ctnType;