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

zd-api/zd-laboratory-api/src/main/java/com/zd/laboratory/api/entity/OneClickFireDTO.java

@@ -17,4 +17,7 @@ public class OneClickFireDTO {
 
     @ApiModelProperty("是否火灾 0否 1是")
     private Integer ifFire;
+
+    @ApiModelProperty("自动执行/手动执行 0手动 1自动")
+    private Integer automanual;
 }