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

whycq

2022-11-01 bcefacbe2e7a5c375b38c70065985498a3e0e3fe

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

@@ -176,6 +176,11 @@
    @TableField("ctn_no")
    private String ctnNo;

    /**
     * 是否冻结
     */
    @ApiModelProperty(value= "是否冻结")
    private Integer frozen;

    public String getWhsType$(){
        BasWhsService service = SpringUtils.getBean(BasWhsService.class);