Merge branch 'local_20221014' into huacheng_test

yanghui

2022-10-19 3a505ba8b2b27b16e355087c0b109b048f8c03a3

Merge branch 'local_20221014' into huacheng_test

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActNeighborCircleWestDO.java

@@ -131,6 +131,45 @@
     */
    private Integer isDel;

    /**
     * 使用类型（1.邻里圈 2.问题清单 3.需求清单）
     */
    private Integer belongType;

    private Integer solveStatus;

    private Integer orderStatus;

    private Long solveId;

    private String solveContent;

    private String solveUrl;

    private Date orderTime;

    private Date solveTime;

    private Date commentTime;

    private String comment;

    private Integer orderType;

    private Integer helpMemberType;

    private String helpMemberContent;

    private Integer helpOrgType;

    private String helpOrgContent;

    private Long solveUnitId;

    private String realServiceTime;

    private String targetServiceTime;

    @Override
    public String toString() {
        return "ComActNeighborCircleDO{" + "id=" + id + ", releaseId=" + releaseId + ", releasePhone=" + releasePhone