Merge branch 'local_20221010' into huacheng_test

yanghui

2022-10-10 c60eea0ab4d74ab8f39a33f896e978dc591f1800

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