Merge branch 'huacheng_test' into huacheng

101captain

2022-06-17 871972f549897b9cf3d9bd9da8ebfc897dc9fb1a

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

@@ -47,6 +47,9 @@
    private Integer isHelp;

    private String phone;

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