Merge branch 'west_bigscreen_dev' into 'master'

罗元桥

2021-12-14 ecde7a30a43e3d45be2f0f9e271d0abf02c7d58e

 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;
}