合并代码，解决冲突

zhangchao

2024-11-02 c51ab886ca899243f36cffe6c1a86d19057d44f5

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

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

    /**
     * 提升机号
     */
    @ApiModelProperty(value= "提升机号")
    @TableField("lift_no")
    private Integer liftNo;

    public WrkMast() {}

    public String getYmd$(){