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

LSH

2023-12-02 e4d5a0e37babc1ae214c34162e58f5084927d301

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

@@ -314,7 +314,7 @@
     * wms任务号
     */
    @ApiModelProperty(value= "wms任务号")
    @TableField("task_no")
    @TableField("wms_wrk_no")
    private String taskNo;

    /**