Merge remote-tracking branch 'origin/master'

huanghongfa

2021-12-07 9849a99706d2c3c540d29778a1b5ff24a29264a8

 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;

}