Merge branch 'test' into 'master'

罗元桥

2021-08-02 7671fa0c16cc3d4daa9795d68c057bb7a4de2b5f

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComSwPatrolRecordVO.java

@@ -215,6 +215,7 @@
    private Integer displayButton;

    @ApiModelProperty("隐患/安全记录id")
    @JsonSerialize(using = ToStringSerializer.class)
    private Long serviceId;

    /**