Merge branch 'test_bak' into 'master'

罗元桥

2021-10-19 0f892f2a0b19d5a182afb887508237963169c804

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

@@ -72,4 +72,7 @@
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date feedbackAt;

    @ApiModelProperty("随手拍类型id")
    private Long classifyId;

}