Merge remote-tracking branch 'origin/dev_New_pro' into dev_宁夏_英泽防锈

liyong

4 天以前 f57064d2fa563ee4cfeeccd715850ba8b8aa4f60

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