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

tangxiaobao

2021-09-06 a18634e047b46e411dac268a0b3a995c22053ea5

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/reserve/AddReserveAdminDTO.java

@@ -44,6 +44,6 @@
    private String jsonObject;

    @ApiModelProperty("是否发布（1.是 2.否）")
    private Integer isPublish;
    private Integer isPublish = 2;

}