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

张天森

2022-07-08 3983e5809d0ed2ce551a157a1b5b326b217c9b9c

 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.需求清单）
     */