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

zjj

2024-06-08 e8b6e450ffbb6bfb9526df427ff1a53053906449

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

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

    /**
     * 伴生工作号
     */
    @ApiModelProperty(value= "伴生工作号")
    @TableField("work_no_other")
    private Integer workNoOther;

    public WrkMastLog() {}

    public String getWrkNo$(){