Commit 156e4063263a193394b55d1bf170bd757fa85ec7

Authored by guzijian
1 parent 530461cb

fix: update object

ruoyi-admin/src/main/java/com/ruoyi/driver/domain/Driver.java
1 package com.ruoyi.driver.domain; 1 package com.ruoyi.driver.domain;
2 2
  3 +import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
3 import org.apache.commons.lang3.builder.ToStringBuilder; 4 import org.apache.commons.lang3.builder.ToStringBuilder;
4 import org.apache.commons.lang3.builder.ToStringStyle; 5 import org.apache.commons.lang3.builder.ToStringStyle;
5 import com.ruoyi.common.annotation.Excel; 6 import com.ruoyi.common.annotation.Excel;
@@ -20,62 +21,77 @@ public class Driver extends BaseEntity @@ -20,62 +21,77 @@ public class Driver extends BaseEntity
20 21
21 /** 工号 */ 22 /** 工号 */
22 @Excel(name = "工号") 23 @Excel(name = "工号")
  24 + @JsonIgnoreProperties(ignoreUnknown = true)
23 private String jobCode; 25 private String jobCode;
24 26
25 /** 公司编码 */ 27 /** 公司编码 */
26 @Excel(name = "公司编码") 28 @Excel(name = "公司编码")
  29 + @JsonIgnoreProperties(ignoreUnknown = true)
27 private String companyCode; 30 private String companyCode;
28 31
29 /** 分公司编码 */ 32 /** 分公司编码 */
30 @Excel(name = "分公司编码") 33 @Excel(name = "分公司编码")
  34 + @JsonIgnoreProperties(ignoreUnknown = true)
31 private String brancheCompanyCode; 35 private String brancheCompanyCode;
32 36
33 /** 姓名 */ 37 /** 姓名 */
34 @Excel(name = "姓名") 38 @Excel(name = "姓名")
  39 + @JsonIgnoreProperties(ignoreUnknown = true)
35 private String personnelName; 40 private String personnelName;
36 41
37 /** 运营服务证书号 */ 42 /** 运营服务证书号 */
38 @Excel(name = "运营服务证书号") 43 @Excel(name = "运营服务证书号")
  44 + @JsonIgnoreProperties(ignoreUnknown = true)
39 private String papersCode; 45 private String papersCode;
40 46
41 /** 一卡通工作卡号 */ 47 /** 一卡通工作卡号 */
42 @Excel(name = "一卡通工作卡号") 48 @Excel(name = "一卡通工作卡号")
  49 + @JsonIgnoreProperties(ignoreUnknown = true)
43 private String icCardCode; 50 private String icCardCode;
44 51
45 /** 性别 */ 52 /** 性别 */
46 @Excel(name = "性别") 53 @Excel(name = "性别")
  54 + @JsonIgnoreProperties(ignoreUnknown = true)
47 private String personnelType; 55 private String personnelType;
48 56
49 /** 所属岗位/工种 */ 57 /** 所属岗位/工种 */
50 @Excel(name = "所属岗位/工种") 58 @Excel(name = "所属岗位/工种")
  59 + @JsonIgnoreProperties(ignoreUnknown = true)
51 private String posts; 60 private String posts;
52 61
53 /** 身份证 */ 62 /** 身份证 */
54 @Excel(name = "身份证") 63 @Excel(name = "身份证")
  64 + @JsonIgnoreProperties(ignoreUnknown = true)
55 private String card; 65 private String card;
56 66
57 /** 联系电话 */ 67 /** 联系电话 */
58 @Excel(name = "联系电话") 68 @Excel(name = "联系电话")
  69 + @JsonIgnoreProperties(ignoreUnknown = true)
59 private String telphone; 70 private String telphone;
60 71
61 /** RFID 人卡IC号 */ 72 /** RFID 人卡IC号 */
62 @Excel(name = "RFID 人卡IC号") 73 @Excel(name = "RFID 人卡IC号")
  74 + @JsonIgnoreProperties(ignoreUnknown = true)
63 private String icRfid; 75 private String icRfid;
64 76
65 /** RFID 人卡ID号(10进制) */ 77 /** RFID 人卡ID号(10进制) */
66 @Excel(name = "RFID 人卡ID号", readConverterExp = "1=0进制") 78 @Excel(name = "RFID 人卡ID号", readConverterExp = "1=0进制")
  79 + @JsonIgnoreProperties(ignoreUnknown = true)
67 private String idRfid; 80 private String idRfid;
68 81
69 /** RFID 标签号 */ 82 /** RFID 标签号 */
70 @Excel(name = "RFID 标签号") 83 @Excel(name = "RFID 标签号")
  84 + @JsonIgnoreProperties(ignoreUnknown = true)
71 private String tagRfid; 85 private String tagRfid;
72 86
73 /** 线路名称 */ 87 /** 线路名称 */
74 @Excel(name = "线路名称") 88 @Excel(name = "线路名称")
  89 + @JsonIgnoreProperties(ignoreUnknown = true)
75 private String lineName; 90 private String lineName;
76 91
77 /** 线路编码 */ 92 /** 线路编码 */
78 @Excel(name = "线路编码") 93 @Excel(name = "线路编码")
  94 + @JsonIgnoreProperties(ignoreUnknown = true)
79 private String lineCode; 95 private String lineCode;
80 96
81 public void setId(Long id) 97 public void setId(Long id)