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

zjj

2023-11-21 ac0906df88505ec24ee910899a036676823f9d63

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

@@ -311,11 +311,11 @@
    private String fullPlt;

    /**
     * 满板
     * wms任务号
     */
    @ApiModelProperty(value= "wms任务号")
    @TableField("wms_wrk_no")
    private Integer wmsWrkNo;
    @TableField("task_no")
    private String taskNo;

    /**
     * 结束时间