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

whycq

2023-01-30 4f4559efbe2d2f20f2c37d8582b74f0a558a54c7

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