Merge remote-tracking branch 'origin/devlop-phyz' into devlop-phyz

1

19 小时以前 c620f4cbc6f5ed50758ea548855773bfed2dcd39

 rsf-server/src/main/java/com/vincent/rsf/server/system/entity/FlowStepInstance.java

@@ -152,6 +152,12 @@
    @ApiModelProperty(value= "wms当前任务类型ID")
    private Integer wmsNowTaskStatus;

    /**
     * 任务号
     */
    @ApiModelProperty(value= "任务号")
    private String taskNo;

    public FlowStepInstance() {}
    public FlowStepInstance(FlowStepTemplate  flowStepTemplate) {
        this.stepTemplateId = flowStepTemplate.getId();