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

lidongdong

2022-11-28 cf985b57d178fad1e18b46b9b020548a90d3d915

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/SysUserFeedbackVO.java

@@ -64,4 +64,7 @@

    @ApiModelProperty("回复内容")
    private String reply;

    private Long propertyId;
    private Integer type;
}