Merge branch 'four_member' into test

101captain

2021-09-26 8be4769bf80c5e28152875a1428e39a9d369e18c

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

@@ -201,4 +201,10 @@
        int yes = 1;
        int ret = 2;
    }
    @ApiModelProperty(value = "单张图片宽度")
    private BigDecimal imgWidth;

    @ApiModelProperty(value = "单张图片高度")
    private BigDecimal imgHeight;

}