From 2b59293282a3245208531a924173e87518f5a1c1 Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期二, 15 八月 2023 21:14:34 +0800
Subject: [PATCH] Merge branch 'master' of http://42.193.1.25:9521/r/sccg_server

---
 ycl-platform/src/main/java/com/ycl/entity/caseHandler/Violations.java |   60 ++++++++++++++++++++++++++++++++++++++++++++++++------------
 1 files changed, 48 insertions(+), 12 deletions(-)

diff --git a/ycl-platform/src/main/java/com/ycl/entity/caseHandler/Violations.java b/ycl-platform/src/main/java/com/ycl/entity/caseHandler/Violations.java
index 4b13968..f7e9cc0 100644
--- a/ycl-platform/src/main/java/com/ycl/entity/caseHandler/Violations.java
+++ b/ycl-platform/src/main/java/com/ycl/entity/caseHandler/Violations.java
@@ -1,15 +1,12 @@
 package com.ycl.entity.caseHandler;
 
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.Version;
-import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableField;
-import java.io.Serializable;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.*;
 
-import lombok.Builder;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.NoArgsConstructor;
+import java.io.Serializable;
 
 /**
  * <p>
@@ -24,6 +21,7 @@
 @TableName("ums_violations")
 @Builder
 @NoArgsConstructor
+@AllArgsConstructor
 public class Violations implements Serializable {
 
     private static final long serialVersionUID = 1L;
@@ -32,78 +30,116 @@
      * 妗堜欢id(鍚寀ms_base_case琛╥d)
      */
     @TableId("id")
-    private Integer id;
+    @ApiModelProperty(value = "妗堜欢id(鍚寀ms_base_case琛╥d)")
+    private Long id;
 
     /**
      * 澶х被
      */
     @TableField("category_id")
+    @ApiModelProperty(value = "澶х被")
     private Integer categoryId;
 
     /**
      * 灏忕被
      */
     @TableField("type_id")
+    @ApiModelProperty(value = "灏忕被")
     private Integer typeId;
 
     /**
      * 浜嬩欢绛夌骇
      */
     @TableField("grade_id")
-    private Integer gradeId;
+    @ApiModelProperty(value = "浜嬩欢绛夌骇")
+    private Long gradeId;
 
     /**
      * 妗堢敱
      */
     @TableField("action_cause")
+    @ApiModelProperty(value = "妗堢敱")
     private String actionCause;
 
     /**
      * 鏄惁鍏宠仈鍟嗛摵
      */
     @TableField("link_shop")
-    private Boolean linkShop;
+    @ApiModelProperty(value = "鏄惁鍏宠仈鍟嗛摵")
+    private Integer linkShop;
 
     /**
      * 鍏宠仈鍟嗛摵鍚嶇О
      */
     @TableField("shop_name")
-    private String shopName;
+    @ApiModelProperty(value = "鍏宠仈鍟嗛摵鍚嶇О")
+    private Integer shopName;
 
     /**
      * 杞︾墝鍙�
      */
     @TableField("car_number")
+    @ApiModelProperty(value = "杞︾墝鍙�")
     private String carNumber;
 
     /**
      * 闂鎻忚堪
      */
     @TableField("description")
+    @ApiModelProperty(value = "闂鎻忚堪")
     private String description;
 
     /**
      * 鍙嶆槧浜�
      */
     @TableField("informant")
+    @ApiModelProperty(value = "鍙嶆槧浜�")
     private String informant;
 
     /**
      * 鍙嶆槧浜鸿仈绯绘柟寮�
      */
     @TableField("informant_phone_code")
+    @ApiModelProperty(value = "鍙嶆槧浜鸿仈绯绘柟寮�")
     private String informantPhoneCode;
 
     /**
      * 韬唤璇佸彿鐮�
      */
     @TableField("informant_id_card")
+    @ApiModelProperty(value = "韬唤璇佸彿鐮�")
     private String informantIdCard;
 
     /**
      * 瑙嗛鎶ヨid
      */
     @TableField("video_alarm_report_id")
+    @ApiModelProperty(value = "瑙嗛鎶ヨid")
     private Integer videoAlarmReportId;
 
+    /**
+     * 瑙嗛鎶ヨid
+     */
+    @TableField("video_point_id")
+    @ApiModelProperty(value = "瑙嗛鐐逛綅")
+    private Integer videoPointId;
+
+    /**
+     * 澶х被鏂囨湰
+     */
+    @TableField(value = "category_text", exist = false)
+    @ApiModelProperty(value = "鎵�灞炵ぞ鍖烘枃鏈�")
+    private String categoryText;
+    /**
+     * 灏忕被鏂囨湰
+     */
+    @TableField(value = "type_text", exist = false)
+    @ApiModelProperty(value = "灏忕被鏂囨湰")
+    private String typeText;
+    /**
+     * 浜嬩欢绛夌骇鏂囨湰
+     */
+    @TableField(value = "grade_text", exist = false)
+    @ApiModelProperty(value = "浜嬩欢绛夌骇鏂囨湰")
+    private String gradeText;
 }

--
Gitblit v1.8.0