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

zhou zhou

昨天 10776dd6f7f9ef9e47419427fcb1b692ed73d54d

 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();