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

zss

3 天以前 d5d089eff99cd51695697679a95445b6b5b0d205

 src/main/java/com/ruoyi/technology/pojo/TechnologyRoutingOperation.java

@@ -58,4 +58,7 @@
    @Schema(description = "部门ID")
    @TableField(fill = FieldFill.INSERT)
    private Long deptId;

    @Schema(description = "类型 区分计时和计件，0计时，1计件")
    private Integer type;
}