Merge branch 'shuangzheng2' into huacheng_test

101captain

2022-08-01 bf46bac3cda70dc8dc7ed95e0461f1a72fba2eeb

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/neighbor/ComActNeighborCircleAppDTO.java

@@ -50,6 +50,8 @@

    @ApiModelProperty("接单类型 1单位 2个人")
    private Integer orderType;
    @ApiModelProperty("清单状态")
    private Integer status;
    /**
     * 使用类型（1.邻里圈 2.问题清单 3.需求清单）
     */