Merge branch 'zigonggao_dev' into huacheng_test

fengjin

2022-10-15 2d28d91d6ca70f8b60a24f6807ff1a2d1e117eb2

 flower_city/src/main/java/com/dg/core/db/gen/entity/GuideRepairOrder.java

@@ -181,6 +181,19 @@
    @ApiModelProperty(name = "serviceState", value = "服务状态(1.已解决 2.未解决)")
    private  Integer serviceState;

    /**
     * 超时时间
     */
    @ApiModelProperty("超时时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private LocalDateTime timeoutTime;

    /**
     * 是否推送过（1 是 2 否）
     */
    @ApiModelProperty("是否推送过（1 是 2 否）")
    private Integer isPush;

    @TableField(exist = false)
    @ApiModelProperty(name = "sumClassifyName", value = "完整分类名称")
    private String sumClassifyName;