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

luxiaotao1123

2021-06-09 da40f82d921daa63de501392519c6ecfbe8962a3

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

@@ -83,6 +83,10 @@
    @TableField("appe_time")
    private Date appeTime;

    @ApiModelProperty(value= "物料状态")
    @TableField("mat_status")
    private String matStatus;

    public String getLocNo$(){
        LocMastService service = SpringUtils.getBean(LocMastService.class);
        LocMast locMast = service.selectById(this.locNo);