From ee9389f45ad0c5bb72b5fb878dda1ecf2135154e Mon Sep 17 00:00:00 2001
From: 张天森 <1292933220@qq.com>
Date: 星期四, 29 九月 2022 10:52:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test
---
flower_city/src/main/java/com/dg/core/db/gen/entity/GuideRepairOrder.java | 30 ++++++++++++++++++++++++++++--
1 files changed, 28 insertions(+), 2 deletions(-)
diff --git a/flower_city/src/main/java/com/dg/core/db/gen/entity/GuideRepairOrder.java b/flower_city/src/main/java/com/dg/core/db/gen/entity/GuideRepairOrder.java
index e63a547..463cb51 100644
--- a/flower_city/src/main/java/com/dg/core/db/gen/entity/GuideRepairOrder.java
+++ b/flower_city/src/main/java/com/dg/core/db/gen/entity/GuideRepairOrder.java
@@ -149,11 +149,11 @@
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime updateTime;
- @TableField(exist = false)
@ApiModelProperty(name = "images", value = "图片地址(用逗号分隔)")
private String images;
-
+ @ApiModelProperty(name = "video", value = "视频地址")
+ private String video;
@TableField(exist = false)
@ApiModelProperty(name = "guideRepairOrderList", value = "工单处理进度")
@@ -169,6 +169,32 @@
@ApiModelProperty(name = "evaluateState", value = "评价状态")
private String evaluateState;
+ @ApiModelProperty(name = "serviceState", value = "服务状态(1.已解决 2.未解决)")
+ private Integer serviceState;
+
+ @TableField(exist = false)
+ @ApiModelProperty(name = "sumClassifyName", value = "完整分类名称")
+ private String sumClassifyName;
+
+ @TableField(exist = false)
+ @ApiModelProperty(name = "consultUser", value = "咨询人姓名+电话")
+ private String consultUser;
+
+ @TableField(exist = false)
+ @ApiModelProperty(name = "submitUser", value = "提交人姓名+电话")
+ private String submitUser;
+
+ @TableField(exist = false)
+ @ApiModelProperty(name = "guideUser", value = "导办人姓名+电话")
+ private String guideUser;
+
+ @TableField(exist = false)
+ @ApiModelProperty(name = "organizationName", value = "创建部门")
+ private String organizationName;
+
+ @TableField(exist = false)
+ @ApiModelProperty(name = "guideDepartmentName", value = "导办部门")
+ private String guideDepartmentName;
@Override
public String toString() {
--
Gitblit v1.7.1