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

Junjie

2023-03-20 7bea8428d74527993cb4ae47d01c79850b5f34bc

 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$(){