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

huanghongfa

2021-09-30 d063e28629db4f1b9ff5c102d72406c9a0698edd

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

@@ -92,6 +92,12 @@
     */
    @ApiModelProperty(value = "社区id")
    private Long communityId;

    /**
     * 处理图片
     */
    @ApiModelProperty("处理图片")
    private String solveUrl;
    /**
     * 报警类型 1一键报警 2长时间无应答报警
     */