Merge branch 'zigonggao_dev' into huacheng_test

fengjin

2022-10-11 912e143c73f70ddcf43840bec60c35a3af12c312

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

@@ -155,6 +155,9 @@
    @ApiModelProperty(name = "video", value = "视频地址")
    private String video;

    @ApiModelProperty(name = "isTimeout", value = "是否超时 （1 未超时   2已超时）")
    private String isTimeout;

    @TableField(exist = false)
    @ApiModelProperty(name = "guideRepairOrderList", value = "工单处理进度")
    List<GuideEvolveEntity> guideEvolveEntities;