Merge branch 'jsxswms' of http://47.97.1.152:5880/r/zy-asrs into jsxswms

skyouc

3 天以前 4ad955ed562ce9add346779791f8678b55b8c2a8

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

@@ -309,6 +309,7 @@

    @ApiModelProperty("库位类型")
    @TableField("loc_type")
    @ExcelProperty(value = "库位类型")
    private Long locType;

    /**