Merge branch 'master' of https://gitee.com/luxiaotao1123/xtywms

luxiaotao1123

2021-06-08 84d7dbea21cbe9276bd1eccdb3e60daef095242e

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

@@ -48,6 +48,9 @@
    @ApiModelProperty(value= "仓库")
    private String warehouse;

    @TableField(exist = false)
    private String warehouseName;

    @ApiModelProperty(value= "品牌")
    private String brand;