Merge remote-tracking branch 'origin/test' into txb

tangxiaobao

2021-08-31 06650302163e395c038b37a10d5c4214ba9cc8a9

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

@@ -25,4 +25,6 @@
    @ApiModelProperty("预约时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date reserveTime;
    @ApiModelProperty("姓名")
    private String name;
}