Quellcode durchsuchen

用户信息表-学历

chenshudong vor 6 Tagen
Ursprung
Commit
a2d5a931fb

+ 13 - 11
airport-common/src/main/java/com/sundot/airport/common/core/domain/entity/SysUser.java

@@ -200,17 +200,7 @@ public class SysUser extends BaseEntity {
200 200
      */
201 201
     @Excel(name = "紧急联系人关系", readConverterExp = "PARENT=父母,SPOUSE=配偶,CHILD=子女,OTHER=其他", combo = "父母,配偶,子女,其他")
202 202
     private String emergencyContactRelationship;
203
-    /**
204
-     * 学历(硕士、本科、专科、技校)
205
-     */
206
-    @Excel(name = "学历", readConverterExp = "1=小学及以下," +
207
-            "2=初中," +
208
-            "3=高中," +
209
-            "4=专科," +
210
-            "5=本科," +
211
-            "6=研究生及以上",
212
-            combo = "小学及以下,初中,高中,专科,本科,研究生及以上")
213
-    private String schooling;
203
+
214 204
     /**
215 205
      * 政治审核情况
216 206
      */
@@ -237,6 +227,18 @@ public class SysUser extends BaseEntity {
237 227
     private Date xrayOperatorStarttime;
238 228
 
239 229
     /**
230
+     * 学历(硕士、本科、专科、技校)
231
+     */
232
+    @Excel(name = "学历", readConverterExp = "1=小学及以下," +
233
+            "2=初中," +
234
+            "3=高中," +
235
+            "4=专科," +
236
+            "5=本科," +
237
+            "6=研究生及以上",
238
+            combo = "小学及以下,初中,高中,专科,本科,研究生及以上")
239
+    private String schooling;
240
+
241
+    /**
240 242
      * 专业
241 243
      */
242 244
     @Excel(name = "专业")