Merge remote-tracking branch 'origin/main'

src/main/java/com/budwk/app/sys/models/Sys_user.java

@@ -247,6 +247,11 @@ public class Sys_user extends BaseModel implements Serializable {
     @Default(value = "0")
     private Boolean member;
 
+    @Column
+    @Comment("会员加入时间")
+    @ColDefine(type = ColType.DATETIME)
+    private Date memberTime;
+
     @Column
     @Comment("是否福利会员")
     @ColDefine(type = ColType.BOOLEAN)
@@ -296,6 +301,16 @@ public class Sys_user extends BaseModel implements Serializable {
     @ColDefine(type = ColType.VARCHAR, width = 50)
     private String wxOpenId;
 
+    @Column
+    @Comment("是否教学30年以上教工")
+    @ColDefine(type = ColType.BOOLEAN)
+    private Boolean isThirtyTeach;
+
+    @Column
+    @Comment("荣誉证办理年月")
+    @ColDefine(type = ColType.VARCHAR, width = 20)
+    private String thirtyCertificateProcessingTime;
+
     @One(field = "unitId")
     private Sys_unit unit;
 
@@ -336,4 +351,8 @@ public class Sys_user extends BaseModel implements Serializable {
     @ColDefine(type = ColType.BOOLEAN)
     private boolean disabled;
 
+    @Column
+    @Comment("openId")
+    @ColDefine(type = ColType.VARCHAR, width = 50)
+    private String openId;
 }