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

luxiaotao1123

2023-02-02 5e966ab720ffff2bd0fe55ffda7263606923732d

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

@@ -335,6 +335,11 @@
    @TableField("take_none")
    private String takeNone;

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

    public String getYmd$(){