Merge remote-tracking branch 'origin/bfasrs' into bfasrs

whycq

2023-01-30 4f4559efbe2d2f20f2c37d8582b74f0a558a54c7

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

@@ -182,6 +182,13 @@
    @ApiModelProperty(value= "是否冻结")
    private Integer frozen;

    /**
     * 冻结备注
     */
    @ApiModelProperty(value= "冻结备注")
    @TableField("frozen_memo")
    private String frozenMemo;

    public String getWhsType$(){
        BasWhsService service = SpringUtils.getBean(BasWhsService.class);
        BasWhs basWhs = service.selectById(this.whsType);