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

101captain

2022-05-06 edfa63ce36732f7355bf23dc04eea6d6db1c60bd

 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;

}