Merge branch 'jsxswms' of http://47.97.1.152:5880/r/zy-asrs into jsxswms

skyouc

2 天以前 8570b32ed879dbe625b58d31c6ed04288cd9d476

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

@@ -195,6 +195,12 @@
    @TableField("frozen_memo")
    private String frozenMemo;

    @TableField("area_id")
    private Long areaId;

    @TableField("area_name")
    private String areaName;


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