Merge remote-tracking branch 'origin/master'

王佳豪

2021-04-26 6704225b102b684e6ce4e88fa897414fac06c9f1

 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);