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

huanghongfa

2021-10-08 0b8c7a1141859aed7f1ce69b40b6ccde31daa931

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