Merge branch 'phyzasrs-erp' into phyzasrs-erp-4

zhangc

2024-12-23 dcc9b7294a7f47c00445d2b8dec0097b6b3b0e5e

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