Merge branch 'dev_New_pro' into dev_宁夏_英泽防锈

zss

2 天以前 9d42f647f5589e4a560d745d6b359ae6c273bd8d

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

@@ -49,7 +49,7 @@
    @Schema(description = "是否质检")
    private Boolean isQuality;

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

    @Schema(description = "设备id")