Merge remote-tracking branch 'origin/tzskasrs-1' into tzskasrs-1

Junjie

2023-12-23 a0abdbc0b19c855fa53e47a9196dfa2cd41e8e9d

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