Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop

skyouc

2025-05-28 e98be9d02d12b0453c6267190b86fdbc11fee9fc

 rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Task.java

@@ -60,7 +60,7 @@
    private Long parentId;

    @ApiModelProperty("仓库类型")
    private Integer warehType;
    private String warehType;

    /**
     * 任务类型
@@ -152,6 +152,7 @@
     * 是否删除 1: 是  0: 否  
     */
    @ApiModelProperty(value= "是否删除 1: 是  0: 否  ")
    @TableLogic
    private Integer deleted;

    /**