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

huanghongfa

2021-10-08 57cd8d8bf2c8b77dade86efa1ac51dae72c7656c

 springcloud_k8s_panzhihuazhihuishequ/service_property/src/main/java/com/panzhihua/service_property/entity/ComPropertyAlarm.java

@@ -98,6 +98,11 @@
     */
    @ApiModelProperty("处理图片")
    private String solveUrl;

    /**
     *接收人
     */
    private  String receiveNo;
    /**
     * 报警类型 1一键报警 2长时间无应答报警
     */