Merge remote-tracking branch 'origin/master'

王佳豪

2021-06-07 752332b433e6ddd72f8e4dd551a0eeb2e3c0939b

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

@@ -87,12 +87,6 @@
    @TableField("mat_status")
    private String matStatus;

    /**
     * 物料状态批量修改标识
     */
    @TableField(exist = false)
    private String matStatusFlag;

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