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

huanghongfa

2021-08-04 e70053d772947e6e50cfa42f5a544a009699c4ac

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

@@ -218,6 +218,9 @@
    @JsonSerialize(using = ToStringSerializer.class)
    private Long serviceId;

    @ApiModelProperty("隐患or安全记录（1.隐患 2.安全记录）")
    private Integer dangerOrRecord;

    /**
     * 巡查类型
     */