Merge branch 'master' into test

puhanshu

2021-12-29 ca4034c3a285f2c22fa19e5eaa88d505b5588c0b

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/property/ComPropertyAlarmVO.java

@@ -102,4 +102,10 @@
     */
    @ApiModelProperty("纬度")
    private String latitude;

    /**
     * 接收人
     */
    @ApiModelProperty("接收人")
    private String receiveName;
}