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

skyouc

1 天以前 7cf2e143941e1548cc468992ada42106a27805a1

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

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

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

    /**