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

huanghongfa

2021-06-05 62ef4ba5d19e489e8cb0a87f0e95fbb945dd7fde

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/ComActEasyPhotoVO.java

@@ -30,8 +30,8 @@
    @ApiModelProperty(value = "地址备注")
   private String addrRemark;

//    @ApiModelProperty(value = "状态 1待处理 2已处理")
//   private Integer status;
    @ApiModelProperty(value = "状态 1待处理 2已处理")
   private Integer handleStatus;

    @ApiModelProperty(value = "处理人id")
   private Long handlerId;