Merge remote-tracking branch 'origin/master'

王佳豪

2021-06-04 9891b042e48b186bbb850ab2ed445308bf5eec72

 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;