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

buhuazhen

6 天以前 2aa05de6d43f32820bc6fd21df4bd0202ecae85f

 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")