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

CeDo

2021-06-03 79f76bd108aae3a6bb0c7b66150e1ac69a6563a3

 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;