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

zss

9 天以前 c483ee040589c0063724059228e7e6c8e4ff943c

 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;
}