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

verou

2025-04-02 2b35183407eb7b1b1524f7b101f1098d9caea042

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

@@ -55,9 +55,8 @@
    @ApiModelProperty(value= "物料名称")
    private String maktx;


    @ApiModelProperty("源编码")
    private String sourceCode;
    private Long source;

    @ApiModelProperty("单据ID")
    private Long orderId;
@@ -119,7 +118,6 @@
     * 是否删除 1: 是  0: 否  
     */
    @ApiModelProperty(value= "是否删除 1: 是  0: 否  ")
    @TableLogic
    private Integer deleted;

    /**