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

huanghongfa

2021-08-19 c40be027ef8068b9a77bb24c94291dee25f563d8

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

@@ -26,7 +26,7 @@
    /**
     * 安全工作记录id
     */
    @ApiModelProperty("巡查记录id")
    @ApiModelProperty("安全工作记录id")
    @JsonSerialize(using = ToStringSerializer.class)
    private Long id;