合并代码，解决冲突

zhangchao

2024-11-02 c51ab886ca899243f36cffe6c1a86d19057d44f5

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

@@ -41,7 +41,7 @@
    @TableField("whs_type")
    private Long whsType;

    @ApiModelProperty(value= "")
    @ApiModelProperty(value= "erp仓库编码")
    @TableField("plt_type")
    private Integer pltType;