From 17bd0962b7caba32f35d29a1082e7c998342e65d Mon Sep 17 00:00:00 2001 From: mitao <2763622819@qq.com> Date: 星期一, 24 二月 2025 00:17:52 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/model/entity/ComplaintFlow.java | 24 +++++++++++++++--------- 1 files changed, 15 insertions(+), 9 deletions(-) diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/model/entity/ComplaintFlow.java b/springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/model/entity/ComplaintFlow.java index 6abfa87..5b4d244 100644 --- a/springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/model/entity/ComplaintFlow.java +++ b/springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/model/entity/ComplaintFlow.java @@ -1,5 +1,6 @@ package com.panzhihua.sangeshenbian.model.entity; +import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableId; @@ -31,24 +32,29 @@ private static final long serialVersionUID = 1L; @ApiModelProperty(value = "主键ID") - @TableId(value = "id") - private Integer id; + @TableId(value = "id",type = IdType.ASSIGN_ID) + private Long id; - @ApiModelProperty(value = "处理层级: 0-社区 1-街道 2-区/县 3市") + @ApiModelProperty(value = "主键ID") + @TableId(value = "complaint_id") + private Long complaintId; + + @ApiModelProperty(value = "处理层级: 1-市级,2-区县,3-街道,4-社区") @TableField("level") - private Boolean level; + private Integer level; @ApiModelProperty(value = "处理单位名称") @TableField("name") private String name; @ApiModelProperty(value = "下派时间") - @TableField("dispatch_time") - private Date dispatchTime; + @TableField("create_time") + private Date createTime; - @ApiModelProperty(value = "处理状态:0-未处理 1-已处理") - @TableField("status") - private Boolean status; + @ApiModelProperty(value = "流转类型 0-上报 1-下派") + @TableField("type") + private Integer type; + } -- Gitblit v1.7.1