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

tangxiaobao

2021-08-19 4cb51a8d6a46993cb30e22dcbaf85424a0ba9d43

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

@@ -83,6 +83,9 @@
   @ApiModelProperty(value = "发布人头像")
   private String imageUrl;

   @ApiModelProperty(value = "发生地址经纬度信息，逗号分割(长的在前面，短的在后面)")
   private String lngLat;

   @ApiModelProperty(value = "随手拍类型列表")
   private List<String> easyPhotoList;