swagger

common/src/test/java/com/koobietech/eas/common/utils/PasswordManagerTest.java

@@ -1,7 +1,10 @@
 package com.koobietech.eas.common.utils;
 
+
 class PasswordManagerTest {
 
+
+
     public static void main(String[] args) {
 
 

controller/pom.xml

@@ -14,6 +14,10 @@
     </parent>
 
     <dependencies>
+        <dependency>
+            <groupId>com.github.xiaoymin</groupId>
+            <artifactId>knife4j-openapi3-spring-boot-starter</artifactId>
+        </dependency>
         <dependency>
             <groupId>com.koobietech.eas</groupId>
             <artifactId>security</artifactId>
@@ -44,6 +48,12 @@
             <artifactId>service</artifactId>
             <version>${project.version}</version>
         </dependency>
+        <dependency>
+            <groupId>com.koobietech.eas</groupId>
+            <artifactId>dao</artifactId>
+            <version>0.0.1-SNAPSHOT</version>
+            <scope>compile</scope>
+        </dependency>
     </dependencies>
 
     <dependencyManagement>

controller/src/main/java/com/koobietech/eas/config/SwaggerConfiguration.java

@@ -0,0 +1,28 @@
+package com.koobietech.eas.config;
+
+import io.swagger.v3.oas.models.OpenAPI;
+import io.swagger.v3.oas.models.info.Info;
+import io.swagger.v3.oas.models.info.License;
+import org.springdoc.core.GroupedOpenApi;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+@Configuration
+public class SwaggerConfiguration {
+    @Bean
+    public GroupedOpenApi baseRestApi() {
+        return GroupedOpenApi.builder()
+                .group("爱扣钉教务系统接口文档")
+                .packagesToScan("com.koobietech.eas").build();
+    }
+
+
+    @Bean
+    public OpenAPI springShopOpenApi() {
+        return new OpenAPI()
+                .info(new Info().title("爱扣钉教务接口文档")
+                        .description("爱扣钉教务接口文档，openapi3.0 接口，用于前端对接")
+                        .version("v0.0.1")
+                        .license(new License().name("使用请遵守APACHE2.0授权协议").url("http://edu.koobietech.com")));
+    }
+}

controller/src/main/java/com/koobietech/eas/controller/EasUserController.java

@@ -1,28 +1,29 @@
 package com.koobietech.eas.controller;
 
+import com.koobietech.eas.dao.dto.TestDto;
 import com.koobietech.eas.mbg.mapper.EasSysPermissionMapper;
 import com.koobietech.eas.mbg.model.EasSysPermission;
+import com.koobietech.eas.mbg.model.EasSysStudent;
 import com.koobietech.eas.service.DemoService;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
 import java.util.List;
 
 @RestController
+@Tag(name = "用户控制器")
 public class EasUserController {
 
-    @Resource
-    EasSysPermissionMapper easSysPermissionMapper;
-
     @Resource
     DemoService demoService;
 
-    @RequestMapping("/test")
-    public String test(){
-        return demoService.test();
+    @PostMapping("/test")
+    @Operation(summary = "控制器测试用例" , description = "用于演示Swagger配置注解")
+    public List<EasSysStudent> test(@RequestBody TestDto dto){
+
+        return demoService.test( dto );
     }
 
 }

controller/src/main/resources/application.yaml

@@ -8,6 +8,16 @@ spring:
     call-setters-on-nulls: true
     map-underscore-to-camel-case: true
 
+  servlet:
+    multipart:
+      max-file-size: 100MB
+      max-request-size: 100MB
+      enabled: true
+
+  jackson:
+    date-format: yyyy-MM-dd HH:mm:ss
+    time-zone: GMT+8
+
   redis:
     host: localhost
     database: 0
@@ -17,8 +27,7 @@ spring:
 security:
   url:
     ignored:
-      - /login
-      - /test
+      - /**
 
 eas:
   jwt-secret-key: 123456

dao/pom.xml

@@ -7,6 +7,13 @@
     <name>dao</name>
     <description>dao</description>
 
+    <dependencies>
+        <dependency>
+            <groupId>com.github.xiaoymin</groupId>
+            <artifactId>knife4j-openapi3-spring-boot-starter</artifactId>
+        </dependency>
+    </dependencies>
+
     <parent>
         <artifactId>eas-system</artifactId>
         <groupId>com.koobietech.eas</groupId>

dao/src/main/java/com/koobietech/eas/dao/dto/TestDto.java

@@ -0,0 +1,12 @@
+package com.koobietech.eas.dao.dto;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+@Data
+public class TestDto {
+    @Schema(description = "学员ID")
+    int id;
+    @Schema(description = "学员名字")
+    String name;
+}

mbg/pom.xml

@@ -16,9 +16,8 @@
 
     <dependencies>
         <dependency>
-            <groupId>io.springfox</groupId>
-            <artifactId>springfox-swagger2</artifactId>
-            <version>${springfox-swagger2.version}</version>
+            <groupId>com.github.xiaoymin</groupId>
+            <artifactId>knife4j-openapi3-spring-boot-starter</artifactId>
         </dependency>
         <dependency>
             <groupId>org.mybatis.generator</groupId>

mbg/src/main/java/com/koobietech/eas/mbg/CommentGenerator.java

@@ -16,7 +16,7 @@ import java.util.Properties;
 public class CommentGenerator extends DefaultCommentGenerator {
     private boolean addRemarkComments = false;
     private static final String EXAMPLE_SUFFIX="Example";
-    private static final String API_MODEL_PROPERTY_FULL_CLASS_NAME="io.swagger.annotations.ApiModelProperty";
+    private static final String API_MODEL_PROPERTY_FULL_CLASS_NAME="io.swagger.v3.oas.annotations.media.Schema";
 
     /**
      * 设置用户配置的参数
@@ -42,7 +42,7 @@ public class CommentGenerator extends DefaultCommentGenerator {
                 remarks = remarks.replace("\"","'");
             }
             //给model的字段添加swagger注解
-            field.addJavaDocLine("@ApiModelProperty(value = \""+remarks+"\")");
+            field.addJavaDocLine("@Schema(description = \""+remarks+"\")");
         }
     }
 

mbg/src/main/java/com/koobietech/eas/mbg/mapper/EasArcArchivesMapper.java

@@ -2,7 +2,7 @@ package com.koobietech.eas.mbg.mapper;
 
 import com.koobietech.eas.mbg.model.EasArcArchives;
 import com.koobietech.eas.mbg.model.EasArcArchivesExample;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
 import java.util.List;
 import org.apache.ibatis.annotations.Param;
 

mbg/src/main/java/com/koobietech/eas/mbg/mapper/EasArcArctypeMapper.java

@@ -2,7 +2,7 @@ package com.koobietech.eas.mbg.mapper;
 
 import com.koobietech.eas.mbg.model.EasArcArctype;
 import com.koobietech.eas.mbg.model.EasArcArctypeExample;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
 import java.util.List;
 import org.apache.ibatis.annotations.Param;
 

mbg/src/main/java/com/koobietech/eas/mbg/mapper/EasArcTlsAttendanceMapper.java

@@ -2,7 +2,7 @@ package com.koobietech.eas.mbg.mapper;
 
 import com.koobietech.eas.mbg.model.EasArcTlsAttendance;
 import com.koobietech.eas.mbg.model.EasArcTlsAttendanceExample;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
 import java.util.List;
 import org.apache.ibatis.annotations.Param;
 

mbg/src/main/java/com/koobietech/eas/mbg/mapper/EasArcTlsScoresMapper.java

@@ -2,7 +2,7 @@ package com.koobietech.eas.mbg.mapper;
 
 import com.koobietech.eas.mbg.model.EasArcTlsScores;
 import com.koobietech.eas.mbg.model.EasArcTlsScoresExample;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
 import java.util.List;
 import org.apache.ibatis.annotations.Param;
 

mbg/src/main/java/com/koobietech/eas/mbg/mapper/EasArcTlsStudentsMapper.java

@@ -2,7 +2,7 @@ package com.koobietech.eas.mbg.mapper;
 
 import com.koobietech.eas.mbg.model.EasArcTlsStudents;
 import com.koobietech.eas.mbg.model.EasArcTlsStudentsExample;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
 import java.util.List;
 import org.apache.ibatis.annotations.Param;
 

mbg/src/main/java/com/koobietech/eas/mbg/mapper/EasEduCategoryMapper.java

@@ -2,7 +2,7 @@ package com.koobietech.eas.mbg.mapper;
 
 import com.koobietech.eas.mbg.model.EasEduCategory;
 import com.koobietech.eas.mbg.model.EasEduCategoryExample;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
 import java.util.List;
 import org.apache.ibatis.annotations.Param;
 

mbg/src/main/java/com/koobietech/eas/mbg/mapper/EasEduClaRelationMapper.java

@@ -2,7 +2,7 @@ package com.koobietech.eas.mbg.mapper;
 
 import com.koobietech.eas.mbg.model.EasEduClaRelation;
 import com.koobietech.eas.mbg.model.EasEduClaRelationExample;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
 import java.util.List;
 import org.apache.ibatis.annotations.Param;
 

mbg/src/main/java/com/koobietech/eas/mbg/mapper/EasEduClassMapper.java

@@ -2,7 +2,7 @@ package com.koobietech.eas.mbg.mapper;
 
 import com.koobietech.eas.mbg.model.EasEduClass;
 import com.koobietech.eas.mbg.model.EasEduClassExample;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
 import java.util.List;
 import org.apache.ibatis.annotations.Param;
 

mbg/src/main/java/com/koobietech/eas/mbg/mapper/EasEduClassroomMapper.java

@@ -2,7 +2,7 @@ package com.koobietech.eas.mbg.mapper;
 
 import com.koobietech.eas.mbg.model.EasEduClassroom;
 import com.koobietech.eas.mbg.model.EasEduClassroomExample;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
 import java.util.List;
 import org.apache.ibatis.annotations.Param;
 

mbg/src/main/java/com/koobietech/eas/mbg/mapper/EasEduScheduleMapper.java

@@ -2,7 +2,7 @@ package com.koobietech.eas.mbg.mapper;
 
 import com.koobietech.eas.mbg.model.EasEduSchedule;
 import com.koobietech.eas.mbg.model.EasEduScheduleExample;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
 import java.util.List;
 import org.apache.ibatis.annotations.Param;
 

mbg/src/main/java/com/koobietech/eas/mbg/mapper/EasEduSubjectsMapper.java

@@ -2,7 +2,7 @@ package com.koobietech.eas.mbg.mapper;
 
 import com.koobietech.eas.mbg.model.EasEduSubjects;
 import com.koobietech.eas.mbg.model.EasEduSubjectsExample;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
 import java.util.List;
 import org.apache.ibatis.annotations.Param;
 

mbg/src/main/java/com/koobietech/eas/mbg/mapper/EasSysDepRelationMapper.java

@@ -2,7 +2,7 @@ package com.koobietech.eas.mbg.mapper;
 
 import com.koobietech.eas.mbg.model.EasSysDepRelation;
 import com.koobietech.eas.mbg.model.EasSysDepRelationExample;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
 import java.util.List;
 import org.apache.ibatis.annotations.Param;
 

mbg/src/main/java/com/koobietech/eas/mbg/mapper/EasSysDepartmentMapper.java

@@ -2,7 +2,7 @@ package com.koobietech.eas.mbg.mapper;
 
 import com.koobietech.eas.mbg.model.EasSysDepartment;
 import com.koobietech.eas.mbg.model.EasSysDepartmentExample;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
 import java.util.List;
 import org.apache.ibatis.annotations.Param;
 

mbg/src/main/java/com/koobietech/eas/mbg/mapper/EasSysLogsMapper.java

@@ -0,0 +1,37 @@
+package com.koobietech.eas.mbg.mapper;
+
+import com.koobietech.eas.mbg.model.EasSysLogs;
+import com.koobietech.eas.mbg.model.EasSysLogsExample;
+import io.swagger.v3.oas.annotations.media.Schema;
+import java.util.List;
+import org.apache.ibatis.annotations.Param;
+
+public interface EasSysLogsMapper {
+    long countByExample(EasSysLogsExample example);
+
+    int deleteByExample(EasSysLogsExample example);
+
+    int deleteByPrimaryKey(Integer id);
+
+    int insert(EasSysLogs record);
+
+    int insertSelective(EasSysLogs record);
+
+    List<EasSysLogs> selectByExampleWithBLOBs(EasSysLogsExample example);
+
+    List<EasSysLogs> selectByExample(EasSysLogsExample example);
+
+    EasSysLogs selectByPrimaryKey(Integer id);
+
+    int updateByExampleSelective(@Param("record") EasSysLogs record, @Param("example") EasSysLogsExample example);
+
+    int updateByExampleWithBLOBs(@Param("record") EasSysLogs record, @Param("example") EasSysLogsExample example);
+
+    int updateByExample(@Param("record") EasSysLogs record, @Param("example") EasSysLogsExample example);
+
+    int updateByPrimaryKeySelective(EasSysLogs record);
+
+    int updateByPrimaryKeyWithBLOBs(EasSysLogs record);
+
+    int updateByPrimaryKey(EasSysLogs record);
+}

mbg/src/main/java/com/koobietech/eas/mbg/mapper/EasSysPermissionMapper.java

@@ -2,7 +2,7 @@ package com.koobietech.eas.mbg.mapper;
 
 import com.koobietech.eas.mbg.model.EasSysPermission;
 import com.koobietech.eas.mbg.model.EasSysPermissionExample;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
 import java.util.List;
 import org.apache.ibatis.annotations.Param;
 

mbg/src/main/java/com/koobietech/eas/mbg/mapper/EasSysPesRelationMapper.java

@@ -2,7 +2,7 @@ package com.koobietech.eas.mbg.mapper;
 
 import com.koobietech.eas.mbg.model.EasSysPesRelation;
 import com.koobietech.eas.mbg.model.EasSysPesRelationExample;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
 import java.util.List;
 import org.apache.ibatis.annotations.Param;
 

mbg/src/main/java/com/koobietech/eas/mbg/mapper/EasSysStudentMapper.java

@@ -2,7 +2,7 @@ package com.koobietech.eas.mbg.mapper;
 
 import com.koobietech.eas.mbg.model.EasSysStudent;
 import com.koobietech.eas.mbg.model.EasSysStudentExample;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
 import java.util.List;
 import org.apache.ibatis.annotations.Param;
 

mbg/src/main/java/com/koobietech/eas/mbg/mapper/EasSysUserinfoMapper.java

@@ -2,7 +2,7 @@ package com.koobietech.eas.mbg.mapper;
 
 import com.koobietech.eas.mbg.model.EasSysUserinfo;
 import com.koobietech.eas.mbg.model.EasSysUserinfoExample;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
 import java.util.List;
 import org.apache.ibatis.annotations.Param;
 

mbg/src/main/java/com/koobietech/eas/mbg/mapper/EasSystemLogsMapper.java

@@ -1,37 +0,0 @@
-package com.koobietech.eas.mbg.mapper;
-
-import com.koobietech.eas.mbg.model.EasSystemLogs;
-import com.koobietech.eas.mbg.model.EasSystemLogsExample;
-import io.swagger.annotations.ApiModelProperty;
-import java.util.List;
-import org.apache.ibatis.annotations.Param;
-
-public interface EasSystemLogsMapper {
-    long countByExample(EasSystemLogsExample example);
-
-    int deleteByExample(EasSystemLogsExample example);
-
-    int deleteByPrimaryKey(Integer id);
-
-    int insert(EasSystemLogs record);
-
-    int insertSelective(EasSystemLogs record);
-
-    List<EasSystemLogs> selectByExampleWithBLOBs(EasSystemLogsExample example);
-
-    List<EasSystemLogs> selectByExample(EasSystemLogsExample example);
-
-    EasSystemLogs selectByPrimaryKey(Integer id);
-
-    int updateByExampleSelective(@Param("record") EasSystemLogs record, @Param("example") EasSystemLogsExample example);
-
-    int updateByExampleWithBLOBs(@Param("record") EasSystemLogs record, @Param("example") EasSystemLogsExample example);
-
-    int updateByExample(@Param("record") EasSystemLogs record, @Param("example") EasSystemLogsExample example);
-
-    int updateByPrimaryKeySelective(EasSystemLogs record);
-
-    int updateByPrimaryKeyWithBLOBs(EasSystemLogs record);
-
-    int updateByPrimaryKey(EasSystemLogs record);
-}

mbg/src/main/java/com/koobietech/eas/mbg/model/EasArcArchives.java

@@ -1,6 +1,6 @@
 package com.koobietech.eas.mbg.model;
 
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
 import java.io.Serializable;
 import java.util.Date;
 
@@ -12,7 +12,7 @@ public class EasArcArchives implements Serializable {
      *
      * @mbg.generated
      */
-    @ApiModelProperty(value = "文件电子档案号")
+    @Schema(description = "文件电子档案号")
     private String archiveNumber;
 
     /**
@@ -20,7 +20,7 @@ public class EasArcArchives implements Serializable {
      *
      * @mbg.generated
      */
-    @ApiModelProperty(value = "当前电子档案归属那一个学员档案下")
+    @Schema(description = "当前电子档案归属那一个学员档案下")
     private String studentNumber;
 
     /**
@@ -28,7 +28,7 @@ public class EasArcArchives implements Serializable {
      *
      * @mbg.generated
      */
-    @ApiModelProperty(value = "文件存储的路径")
+    @Schema(description = "文件存储的路径")
     private String filePath;
 
     /**
@@ -36,7 +36,7 @@ public class EasArcArchives implements Serializable {
      *
      * @mbg.generated
      */
-    @ApiModelProperty(value = "文件类型Id")
+    @Schema(description = "文件类型Id")
     private Integer arctypeId;
 
     /**
@@ -44,7 +44,7 @@ public class EasArcArchives implements Serializable {
      *
      * @mbg.generated
      */
-    @ApiModelProperty(value = "创建时间")
+    @Schema(description = "创建时间")
     private Date createTime;
 
     /**
@@ -52,7 +52,7 @@ public class EasArcArchives implements Serializable {
      *
      * @mbg.generated
      */
-    @ApiModelProperty(value = "修改时间")
+    @Schema(description = "修改时间")
     private Date modifyTime;
 
     /**
@@ -60,7 +60,7 @@ public class EasArcArchives implements Serializable {
      *
      * @mbg.generated
      */
-    @ApiModelProperty(value = "档案有效期截至时间")
+    @Schema(description = "档案有效期截至时间")
     private Date validityTime;
 
     /**
@@ -68,7 +68,7 @@ public class EasArcArchives implements Serializable {
      *
      * @mbg.generated
      */
-    @ApiModelProperty(value = "档案归属负责人")
+    @Schema(description = "档案归属负责人")
     private Integer managerId;
 
     /**
@@ -76,7 +76,7 @@ public class EasArcArchives implements Serializable {
      *
      * @mbg.generated
      */
-    @ApiModelProperty(value = "档案创建时间, 用于文件归档用")
+    @Schema(description = "档案创建时间, 用于文件归档用")
     private Date createDate;
 
     /**
@@ -84,7 +84,7 @@ public class EasArcArchives implements Serializable {
      *
      * @mbg.generated
      */
-    @ApiModelProperty(value = "创建用户ID")
+    @Schema(description = "创建用户ID")
     private Integer createUid;
 
     private static final long serialVersionUID = 1L;

mbg/src/main/java/com/koobietech/eas/mbg/model/EasArcArctype.java

@@ -1,6 +1,6 @@
 package com.koobietech.eas.mbg.model;
 
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
 import java.io.Serializable;
 import java.util.Date;
 
@@ -12,7 +12,7 @@ public class EasArcArctype implements Serializable {
      *
      * @mbg.generated
      */
-    @ApiModelProperty(value = "类别名")
+    @Schema(description = "类别名")
     private String name;
 
     /**
@@ -20,7 +20,7 @@ public class EasArcArctype implements Serializable {
      *
      * @mbg.generated
      */
-    @ApiModelProperty(value = "是否可以在线预览")
+    @Schema(description = "是否可以在线预览")
     private String isViews;
 
     /**
@@ -28,7 +28,7 @@ public class EasArcArctype implements Serializable {
      *
      * @mbg.generated
      */
-    @ApiModelProperty(value = "模板文件地址")
+    @Schema(description = "模板文件地址")
     private String template;
 
     /**
@@ -36,7 +36,7 @@ public class EasArcArctype implements Serializable {
      *
      * @mbg.generated
      */
-    @ApiModelProperty(value = "是否有备份需求, 如果有数据库备份需求,则 展示模板文件, 因为只有按照模板文件创建的档案才能获取数据存储数据库")
+    @Schema(description = "是否有备份需求, 如果有数据库备份需求,则 展示模板文件, 因为只有按照模板文件创建的档案才能获取数据存储数据库")
     private String backup;
 
     /**
@@ -44,7 +44,7 @@ public class EasArcArctype implements Serializable {
      *
      * @mbg.generated
      */
-    @ApiModelProperty(value = "限制的文件后缀")
+    @Schema(description = "限制的文件后缀")
     private String suffix;
 
     /**
@@ -52,7 +52,7 @@ public class EasArcArctype implements Serializable {
      *
      * @mbg.generated
      */
-    @ApiModelProperty(value = "创建时间")
+    @Schema(description = "创建时间")
     private Date createTime;
 
     /**
@@ -60,7 +60,7 @@ public class EasArcArctype implements Serializable {
      *
      * @mbg.generated
      */
-    @ApiModelProperty(value = "修改时间")
+    @Schema(description = "修改时间")
     private Date modifyTime;
 
     /**
@@ -68,7 +68,7 @@ public class EasArcArctype implements Serializable {
      *
      * @mbg.generated
      */
-    @ApiModelProperty(value = "创建用户")
+    @Schema(description = "创建用户")
     private Integer createUid;
 
     private static final long serialVersionUID = 1L;

mbg/src/main/java/com/koobietech/eas/mbg/model/EasArcTlsAttendance.java

@@ -1,6 +1,6 @@
 package com.koobietech.eas.mbg.model;
 
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
 import java.io.Serializable;
 import java.util.Date;
 
@@ -12,7 +12,7 @@ public class EasArcTlsAttendance implements Serializable {
      *
      * @mbg.generated
      */
-    @ApiModelProperty(value = "签到日期")
+    @Schema(description = "签到日期")
     private Date checkinDate;
 
     /**
@@ -20,7 +20,7 @@ public class EasArcTlsAttendance implements Serializable {
      *
      * @mbg.generated
      */
-    @ApiModelProperty(value = "排课ID")
+    @Schema(description = "排课ID")
     private Integer scheduleId;
 
     /**
@@ -28,7 +28,7 @@ public class EasArcTlsAttendance implements Serializable {
      *
      * @mbg.generated
      */
-    @ApiModelProperty(value = "月份")
+    @Schema(description = "月份")
     private Integer month;
 
     /**
@@ -36,7 +36,7 @@ public class EasArcTlsAttendance implements Serializable {
      *
      * @mbg.generated
      */
-    @ApiModelProperty(value = "a  表示正常出勤,   b  表示迟到、早退, c  表示旷课, d  表示请假, e表示无效")
+    @Schema(description = "a  表示正常出勤,   b  表示迟到、早退, c  表示旷课, d  表示请假, e表示无效")
     private String morning;
 
     /**
@@ -44,7 +44,7 @@ public class EasArcTlsAttendance implements Serializable {
      *
      * @mbg.generated
      */
-    @ApiModelProperty(value = "a  表示正常出勤,   b  表示迟到、早退, c  表示旷课, d  表示请假, e表示无效")
+    @Schema(description = "a  表示正常出勤,   b  表示迟到、早退, c  表示旷课, d  表示请假, e表示无效")
     private String afternoon;
 
     /**
@@ -52,7 +52,7 @@ public class EasArcTlsAttendance implements Serializable {
      *
      * @mbg.generated
      */
-    @ApiModelProperty(value = "学生档案号")
+    @Schema(description = "学生档案号")
     private String studentNumber;
 
     /**
@@ -60,9 +60,25 @@ public class EasArcTlsAttendance implements Serializable {
      *
      * @mbg.generated
      */
-    @ApiModelProperty(value = "创建用户")
+    @Schema(description = "创建用户")
     private Integer createUid;
 
+    /**
+     * 创建时间
+     *
+     * @mbg.generated
+     */
+    @Schema(description = "创建时间")
+    private Date createTime;
+
+    /**
+     * 修改时间
+     *
+     * @mbg.generated
+     */
+    @Schema(description = "修改时间")
+    private Date modifyTime;
+
     private static final long serialVersionUID = 1L;
 
     public Long getId() {
@@ -129,6 +145,22 @@ public class EasArcTlsAttendance implements Serializable {
         this.createUid = createUid;
     }
 
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public Date getModifyTime() {
+        return modifyTime;
+    }
+
+    public void setModifyTime(Date modifyTime) {
+        this.modifyTime = modifyTime;
+    }
+
     @Override
     public String toString() {
         StringBuilder sb = new StringBuilder();
@@ -143,6 +175,8 @@ public class EasArcTlsAttendance implements Serializable {
         sb.append(", afternoon=").append(afternoon);
         sb.append(", studentNumber=").append(studentNumber);
         sb.append(", createUid=").append(createUid);
+        sb.append(", createTime=").append(createTime);
+        sb.append(", modifyTime=").append(modifyTime);
         sb.append(", serialVersionUID=").append(serialVersionUID);
         sb.append("]");
         return sb.toString();

mbg/src/main/java/com/koobietech/eas/mbg/model/EasArcTlsAttendanceExample.java

@@ -641,6 +641,126 @@ public class EasArcTlsAttendanceExample {
             addCriterion("create_uid not between", value1, value2, "createUid");
             return (Criteria) this;
         }
+
+        public Criteria andCreateTimeIsNull() {
+            addCriterion("create_time is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeIsNotNull() {
+            addCriterion("create_time is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeEqualTo(Date value) {
+            addCriterion("create_time =", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeNotEqualTo(Date value) {
+            addCriterion("create_time <>", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeGreaterThan(Date value) {
+            addCriterion("create_time >", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeGreaterThanOrEqualTo(Date value) {
+            addCriterion("create_time >=", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeLessThan(Date value) {
+            addCriterion("create_time <", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeLessThanOrEqualTo(Date value) {
+            addCriterion("create_time <=", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeIn(List<Date> values) {
+            addCriterion("create_time in", values, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeNotIn(List<Date> values) {
+            addCriterion("create_time not in", values, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeBetween(Date value1, Date value2) {
+            addCriterion("create_time between", value1, value2, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeNotBetween(Date value1, Date value2) {
+            addCriterion("create_time not between", value1, value2, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andModifyTimeIsNull() {
+            addCriterion("modify_time is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andModifyTimeIsNotNull() {
+            addCriterion("modify_time is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andModifyTimeEqualTo(Date value) {
+            addCriterion("modify_time =", value, "modifyTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andModifyTimeNotEqualTo(Date value) {
+            addCriterion("modify_time <>", value, "modifyTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andModifyTimeGreaterThan(Date value) {
+            addCriterion("modify_time >", value, "modifyTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andModifyTimeGreaterThanOrEqualTo(Date value) {
+            addCriterion("modify_time >=", value, "modifyTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andModifyTimeLessThan(Date value) {
+            addCriterion("modify_time <", value, "modifyTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andModifyTimeLessThanOrEqualTo(Date value) {
+            addCriterion("modify_time <=", value, "modifyTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andModifyTimeIn(List<Date> values) {
+            addCriterion("modify_time in", values, "modifyTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andModifyTimeNotIn(List<Date> values) {
+            addCriterion("modify_time not in", values, "modifyTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andModifyTimeBetween(Date value1, Date value2) {
+            addCriterion("modify_time between", value1, value2, "modifyTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andModifyTimeNotBetween(Date value1, Date value2) {
+            addCriterion("modify_time not between", value1, value2, "modifyTime");
+            return (Criteria) this;
+        }
     }
 
     public static class Criteria extends GeneratedCriteria {

mbg/src/main/java/com/koobietech/eas/mbg/model/EasArcTlsScores.java

@@ -1,6 +1,6 @@
 package com.koobietech.eas.mbg.model;
 
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
 import java.io.Serializable;
 import java.math.BigDecimal;
 import java.util.Date;
@@ -11,7 +11,7 @@ public class EasArcTlsScores implements Serializable {
      *
      * @mbg.generated
      */
-    @ApiModelProperty(value = "ID")
+    @Schema(description = "ID")
     private Integer id;
 
     /**
@@ -19,7 +19,7 @@ public class EasArcTlsScores implements Serializable {
      *
      * @mbg.generated
      */
-    @ApiModelProperty(value = "学员档案")
+    @Schema(description = "学员档案")
     private String studentNumber;
 
     /**
@@ -27,7 +27,7 @@ public class EasArcTlsScores implements Serializable {
      *
      * @mbg.generated
      */
-    @ApiModelProperty(value = "类目ID")
+    @Schema(description = "类目ID")
     private Integer categoryId;
 
     /**
@@ -35,7 +35,7 @@ public class EasArcTlsScores implements Serializable {
      *
      * @mbg.generated
      */
-    @ApiModelProperty(value = "科目ID")
+    @Schema(description = "科目ID")
     private Integer subjectId;
 
     /**
@@ -43,7 +43,7 @@ public class EasArcTlsScores implements Serializable {
      *
      * @mbg.generated
      */
-    @ApiModelProperty(value = "考试时间")
+    @Schema(description = "考试时间")
     private Date testDate;
 
     /**
@@ -51,7 +51,7 @@ public class EasArcTlsScores implements Serializable {
      *
      * @mbg.generated
      */
-    @ApiModelProperty(value = "分数")
+    @Schema(description = "分数")
     private BigDecimal score;
 
     /**
@@ -59,7 +59,7 @@ public class EasArcTlsScores implements Serializable {
      *
      * @mbg.generated
      */
-    @ApiModelProperty(value = "通过率")
+    @Schema(description = "通过率")
     private BigDecimal passRate;
 
     /**
@@ -67,7 +67,7 @@ public class EasArcTlsScores implements Serializable {
      *
      * @mbg.generated
      */
-    @ApiModelProperty(value = "及格率")
+    @Schema(description = "及格率")
     private BigDecimal excelRate;
 
     /**
@@ -75,7 +75,7 @@ public class EasArcTlsScores implements Serializable {
      *
      * @mbg.generated
      */
-    @ApiModelProperty(value = "创建时间")
+    @Schema(description = "创建时间")
     private Date createTime;
 
     /**
@@ -83,7 +83,7 @@ public class EasArcTlsScores implements Serializable {
      *
      * @mbg.generated
      */
-    @ApiModelProperty(value = "修改时间")
+    @Schema(description = "修改时间")
     private Date modifyTime;
 
     /**
@@ -91,7 +91,7 @@ public class EasArcTlsScores implements Serializable {
      *
      * @mbg.generated
      */
-    @ApiModelProperty(value = "创建用户ID")
+    @Schema(description = "创建用户ID")
     private Integer createUid;
 
     /**
@@ -99,7 +99,7 @@ public class EasArcTlsScores implements Serializable {
      *
      * @mbg.generated
      */
-    @ApiModelProperty(value = "考试备注信息  如 第二次考试  第三次考试")
+    @Schema(description = "考试备注信息  如 第二次考试  第三次考试")
     private String comment;
 
     private static final long serialVersionUID = 1L;

mbg/src/main/java/com/koobietech/eas/mbg/model/EasArcTlsStudents.java

@@ -1,6 +1,6 @@
 package com.koobietech.eas.mbg.model;
 
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
 import java.io.Serializable;
 import java.util.Date;
 
@@ -10,7 +10,7 @@ public class EasArcTlsStudents implements Serializable {
      *
      * @mbg.generated
      */
-    @ApiModelProperty(value = "ID")
+    @Schema(description = "ID")
     private Integer id;
 
     /**
@@ -18,7 +18,7 @@ public class EasArcTlsStudents implements Serializable {
      *
      * @mbg.generated
      */
-    @ApiModelProperty(value = "对应的文件档案号")
+    @Schema(description = "对应的文件档案号")
     private String archiveNumber;
 
     /**
@@ -26,7 +26,7 @@ public class EasArcTlsStudents implements Serializable {
      *
      * @mbg.generated
      */
-    @ApiModelProperty(value = "归属的学员档案号")
+    @Schema(description = "归属的学员档案号")
     private String studentNumber;
 
     /**
@@ -34,7 +34,7 @@ public class EasArcTlsStudents implements Serializable {
      *
      * @mbg.generated
      */
-    @ApiModelProperty(value = "学生姓名")
+    @Schema(description = "学生姓名")
     private String studentName;
 
     /**
@@ -42,7 +42,7 @@ public class EasArcTlsStudents implements Serializable {
      *
      * @mbg.generated
      */
-    @ApiModelProperty(value = "学生性别")
+    @Schema(description = "学生性别")
     private String gender;
 
     /**
@@ -50,7 +50,7 @@ public class EasArcTlsStudents implements Serializable {
      *
      * @mbg.generated
      */
-    @ApiModelProperty(value = "学生出生日期")
+    @Schema(description = "学生出生日期")
     private Date birthdate;
 
     /**
@@ -58,7 +58,7 @@ public class EasArcTlsStudents implements Serializable {
      *
      * @mbg.generated
      */
-    @ApiModelProperty(value = "学生居住地址")
+    @Schema(description = "学生居住地址")
     private String address;
 
     /**
@@ -66,7 +66,7 @@ public class EasArcTlsStudents implements Serializable {
      *
      * @mbg.generated
      */
-    @ApiModelProperty(value = "学生联系电话")
+    @Schema(description = "学生联系电话")
     private String phone;
 
     /**
@@ -74,7 +74,7 @@ public class EasArcTlsStudents implements Serializable {
      *
      * @mbg.generated
      */
-    @ApiModelProperty(value = "学生电子邮箱")
+    @Schema(description = "学生电子邮箱")
     private String email;
 
     /**
@@ -82,7 +82,7 @@ public class EasArcTlsStudents implements Serializable {
      *
      * @mbg.generated
      */
-    @ApiModelProperty(value = "学生入学进入培训班日期")
+    @Schema(description = "学生入学进入培训班日期")
     private Date enrollmentDate;
 
     /**
@@ -90,7 +90,7 @@ public class EasArcTlsStudents implements Serializable {
      *
      * @mbg.generated
      */
-    @ApiModelProperty(value = "学生在培训班毕业日期")
+    @Schema(description = "学生在培训班毕业日期")
     private Date graduationDate;
 
     /**
@@ -98,7 +98,7 @@ public class EasArcTlsStudents implements Serializable {
      *
      * @mbg.generated
      */
-    @ApiModelProperty(value = "学生年级")
+    @Schema(description = "学生年级")
     private Integer grade;
 
     /**
@@ -106,7 +106,7 @@ public class EasArcTlsStudents implements Serializable {
      *
      * @mbg.generated
      */
-    @ApiModelProperty(value = "学生专业")
+    @Schema(description = "学生专业")
     private String major;
 
     /**
@@ -114,7 +114,7 @@ public class EasArcTlsStudents implements Serializable {
      *
      * @mbg.generated
      */
-    @ApiModelProperty(value = "学生辅修专业")
+    @Schema(description = "学生辅修专业")
     private String minor;
 
     /**
@@ -122,7 +122,7 @@ public class EasArcTlsStudents implements Serializable {
      *
      * @mbg.generated
      */
-    @ApiModelProperty(value = "学生所在学校")
+    @Schema(description = "学生所在学校")
     private String university;
 
     /**
@@ -130,7 +130,7 @@ public class EasArcTlsStudents implements Serializable {
      *
      * @mbg.generated
      */
-    @ApiModelProperty(value = "创建时间")
+    @Schema(description = "创建时间")
     private Date createTime;
 
     /**
@@ -138,7 +138,7 @@ public class EasArcTlsStudents implements Serializable {
      *
      * @mbg.generated
      */
-    @ApiModelProperty(value = "修改时间")
+    @Schema(description = "修改时间")
     private Date modifyTime;
 
     /**
@@ -146,7 +146,7 @@ public class EasArcTlsStudents implements Serializable {
      *
      * @mbg.generated
      */
-    @ApiModelProperty(value = "招生老师")
+    @Schema(description = "招生老师")
     private Integer admissionsId;
 
     /**
@@ -154,7 +154,7 @@ public class EasArcTlsStudents implements Serializable {
      *
      * @mbg.generated
      */
-    @ApiModelProperty(value = "直属负责人ID")
+    @Schema(description = "直属负责人ID")
     private Integer managerId;
 
     /**
@@ -162,7 +162,7 @@ public class EasArcTlsStudents implements Serializable {
      *
      * @mbg.generated
      */
-    @ApiModelProperty(value = "创建用户ID")
+    @Schema(description = "创建用户ID")
     private Integer createUid;
 
     private static final long serialVersionUID = 1L;

mbg/src/main/java/com/koobietech/eas/mbg/model/EasEduCategory.java

@@ -1,6 +1,6 @@
 package com.koobietech.eas.mbg.model;
 
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
 import java.io.Serializable;
 import java.util.Date;
 
@@ -12,7 +12,7 @@ public class EasEduCategory implements Serializable {
      *
      * @mbg.generated
      */
-    @ApiModelProperty(value = "学科名称")
+    @Schema(description = "学科名称")
     private String name;
 
     /**
@@ -20,7 +20,7 @@ public class EasEduCategory implements Serializable {
      *
      * @mbg.generated
      */
-    @ApiModelProperty(value = "创建时间")
+    @Schema(description = "创建时间")
     private Date createTime;
 
     /**
@@ -28,7 +28,7 @@ public class EasEduCategory implements Serializable {
      *
      * @mbg.generated
      */
-    @ApiModelProperty(value = "修改时间")
+    @Schema(description = "修改时间")
     private Date modifyTime;
 
     /**
@@ -36,15 +36,23 @@ public class EasEduCategory implements Serializable {
      *
      * @mbg.generated
      */
-    @ApiModelProperty(value = "创建用户ID")
+    @Schema(description = "创建用户ID")
     private Integer createUid;
 
+    /**
+     * 状态
+     *
+     * @mbg.generated
+     */
+    @Schema(description = "状态")
+    private String disabled;
+
     /**
      * 学科描述
      *
      * @mbg.generated
      */
-    @ApiModelProperty(value = "学科描述")
+    @Schema(description = "学科描述")
     private String description;
 
     private static final long serialVersionUID = 1L;
@@ -89,6 +97,14 @@ public class EasEduCategory implements Serializable {
         this.createUid = createUid;
     }
 
+    public String getDisabled() {
+        return disabled;
+    }
+
+    public void setDisabled(String disabled) {
+        this.disabled = disabled;
+    }
+
     public String getDescription() {
         return description;
     }
@@ -108,6 +124,7 @@ public class EasEduCategory implements Serializable {
         sb.append(", createTime=").append(createTime);
         sb.append(", modifyTime=").append(modifyTime);
         sb.append(", createUid=").append(createUid);
+        sb.append(", disabled=").append(disabled);
         sb.append(", description=").append(description);
         sb.append(", serialVersionUID=").append(serialVersionUID);
         sb.append("]");

mbg/src/main/java/com/koobietech/eas/mbg/model/EasEduCategoryExample.java

@@ -414,6 +414,76 @@ public class EasEduCategoryExample {
             addCriterion("create_uid not between", value1, value2, "createUid");
             return (Criteria) this;
         }
+
+        public Criteria andDisabledIsNull() {
+            addCriterion("disabled is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andDisabledIsNotNull() {
+            addCriterion("disabled is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andDisabledEqualTo(String value) {
+            addCriterion("disabled =", value, "disabled");
+            return (Criteria) this;
+        }
+
+        public Criteria andDisabledNotEqualTo(String value) {
+            addCriterion("disabled <>", value, "disabled");
+            return (Criteria) this;
+        }
+
+        public Criteria andDisabledGreaterThan(String value) {
+            addCriterion("disabled >", value, "disabled");
+            return (Criteria) this;
+        }
+
+        public Criteria andDisabledGreaterThanOrEqualTo(String value) {
+            addCriterion("disabled >=", value, "disabled");
+            return (Criteria) this;
+        }
+
+        public Criteria andDisabledLessThan(String value) {
+            addCriterion("disabled <", value, "disabled");
+            return (Criteria) this;
+        }
+
+        public Criteria andDisabledLessThanOrEqualTo(String value) {
+            addCriterion("disabled <=", value, "disabled");
+            return (Criteria) this;
+        }
+
+        public Criteria andDisabledLike(String value) {
+            addCriterion("disabled like", value, "disabled");
+            return (Criteria) this;
+        }
+
+        public Criteria andDisabledNotLike(String value) {
+            addCriterion("disabled not like", value, "disabled");
+            return (Criteria) this;
+        }
+
+        public Criteria andDisabledIn(List<String> values) {
+            addCriterion("disabled in", values, "disabled");
+            return (Criteria) this;
+        }
+
+        public Criteria andDisabledNotIn(List<String> values) {
+            addCriterion("disabled not in", values, "disabled");
+            return (Criteria) this;
+        }
+
+        public Criteria andDisabledBetween(String value1, String value2) {
+            addCriterion("disabled between", value1, value2, "disabled");
+            return (Criteria) this;
+        }
+
+        public Criteria andDisabledNotBetween(String value1, String value2) {
+            addCriterion("disabled not between", value1, value2, "disabled");
+            return (Criteria) this;
+        }
     }
 
     public static class Criteria extends GeneratedCriteria {

mbg/src/main/java/com/koobietech/eas/mbg/model/EasEduClaRelation.java

@@ -1,6 +1,6 @@
 package com.koobietech.eas.mbg.model;
 
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
 import java.io.Serializable;
 import java.util.Date;
 
@@ -12,7 +12,7 @@ public class EasEduClaRelation implements Serializable {
      *
      * @mbg.generated
      */
-    @ApiModelProperty(value = "班级ID")
+    @Schema(description = "班级ID")
     private Long classId;
 
     /**
@@ -20,7 +20,7 @@ public class EasEduClaRelation implements Serializable {
      *
      * @mbg.generated
      */
-    @ApiModelProperty(value = "学习的课程")
+    @Schema(description = "学习的课程")
     private Long categoryId;
 
     /**
@@ -28,7 +28,7 @@ public class EasEduClaRelation implements Serializable {
      *
      * @mbg.generated
      */
-    @ApiModelProperty(value = "学习到当前课程的科目")
+    @Schema(description = "学习到当前课程的科目")
     private Long subjectsId;
 
     /**
@@ -36,7 +36,7 @@ public class EasEduClaRelation implements Serializable {
      *
      * @mbg.generated
      */
-    @ApiModelProperty(value = "学习进度百分比")
+    @Schema(description = "学习进度百分比")
     private Integer progress;
 
     /**
@@ -44,7 +44,7 @@ public class EasEduClaRelation implements Serializable {
      *
      * @mbg.generated
      */
-    @ApiModelProperty(value = "创建时间")
+    @Schema(description = "创建时间")
     private Date createTime;
 
     /**
@@ -52,7 +52,7 @@ public class EasEduClaRelation implements Serializable {
      *
      * @mbg.generated
      */
-    @ApiModelProperty(value = "修改时间")
+    @Schema(description = "修改时间")
     private Date modifyTime;
 
     /**
@@ -60,7 +60,7 @@ public class EasEduClaRelation implements Serializable {
      *
      * @mbg.generated
      */
-    @ApiModelProperty(value = "创建用户ID")
+    @Schema(description = "创建用户ID")
     private Integer createUid;
 
     private static final long serialVersionUID = 1L;

mbg/src/main/java/com/koobietech/eas/mbg/model/EasEduClass.java

@@ -1,6 +1,6 @@
 package com.koobietech.eas.mbg.model;
 
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
 import java.io.Serializable;
 import java.util.Date;
 
@@ -10,7 +10,7 @@ public class EasEduClass implements Serializable {
      *
      * @mbg.generated
      */
-    @ApiModelProperty(value = "学员ID")
+    @Schema(description = "学员ID")
     private Long id;
 
     /**
@@ -18,7 +18,7 @@ public class EasEduClass implements Serializable {
      *
      * @mbg.generated
      */
-    @ApiModelProperty(value = "班级名称")
+    @Schema(description = "班级名称")
     private String name;
 
     /**
@@ -26,7 +26,7 @@ public class EasEduClass implements Serializable {
      *
      * @mbg.generated
      */
-    @ApiModelProperty(value = "班级负责人ID")
+    @Schema(description = "班级负责人ID")
     private Integer manageId;
 
     /**
@@ -34,7 +34,7 @@ public class EasEduClass implements Serializable {
      *
      * @mbg.generated
      */
-    @ApiModelProperty(value = "助教老师ID")
+    @Schema(description = "助教老师ID")
     private Integer assistantId;
 
     /**
@@ -42,7 +42,7 @@ public class EasEduClass implements Serializable {
      *
      * @mbg.generated
      */
-    @ApiModelProperty(value = "创建时间")
+    @Schema(description = "创建时间")
     private Date createTime;
 
     /**
@@ -50,7 +50,7 @@ public class EasEduClass implements Serializable {
      *
      * @mbg.generated
      */
-    @ApiModelProperty(value = "修改时间")
+    @Schema(description = "修改时间")
     private Date modifyTime;
 
     /**
@@ -58,9 +58,17 @@ public class EasEduClass implements Serializable {
      *
      * @mbg.generated
      */
-    @ApiModelProperty(value = "创建用户ID")
+    @Schema(description = "创建用户ID")
     private Integer createUid;
 
+    /**
+     * 状态
+     *
+     * @mbg.generated
+     */
+    @Schema(description = "状态")
+    private String disabled;
+
     private static final long serialVersionUID = 1L;
 
     public Long getId() {
@@ -119,6 +127,14 @@ public class EasEduClass implements Serializable {
         this.createUid = createUid;
     }
 
+    public String getDisabled() {
+        return disabled;
+    }
+
+    public void setDisabled(String disabled) {
+        this.disabled = disabled;
+    }
+
     @Override
     public String toString() {
         StringBuilder sb = new StringBuilder();
@@ -132,6 +148,7 @@ public class EasEduClass implements Serializable {
         sb.append(", createTime=").append(createTime);
         sb.append(", modifyTime=").append(modifyTime);
         sb.append(", createUid=").append(createUid);
+        sb.append(", disabled=").append(disabled);
         sb.append(", serialVersionUID=").append(serialVersionUID);
         sb.append("]");
         return sb.toString();

mbg/src/main/java/com/koobietech/eas/mbg/model/EasEduClassExample.java

@@ -534,6 +534,76 @@ public class EasEduClassExample {
             addCriterion("create_uid not between", value1, value2, "createUid");
             return (Criteria) this;
         }
+
+        public Criteria andDisabledIsNull() {
+            addCriterion("disabled is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andDisabledIsNotNull() {
+            addCriterion("disabled is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andDisabledEqualTo(String value) {
+            addCriterion("disabled =", value, "disabled");
+            return (Criteria) this;
+        }
+
+        public Criteria andDisabledNotEqualTo(String value) {
+            addCriterion("disabled <>", value, "disabled");
+            return (Criteria) this;
+        }
+
+        public Criteria andDisabledGreaterThan(String value) {
+            addCriterion("disabled >", value, "disabled");
+            return (Criteria) this;
+        }
+
+        public Criteria andDisabledGreaterThanOrEqualTo(String value) {
+            addCriterion("disabled >=", value, "disabled");
+            return (Criteria) this;
+        }
+
+        public Criteria andDisabledLessThan(String value) {
+            addCriterion("disabled <", value, "disabled");
+            return (Criteria) this;
+        }
+
+        public Criteria andDisabledLessThanOrEqualTo(String value) {
+            addCriterion("disabled <=", value, "disabled");
+            return (Criteria) this;
+        }
+
+        public Criteria andDisabledLike(String value) {
+            addCriterion("disabled like", value, "disabled");
+            return (Criteria) this;
+        }
+
+        public Criteria andDisabledNotLike(String value) {
+            addCriterion("disabled not like", value, "disabled");
+            return (Criteria) this;
+        }
+
+        public Criteria andDisabledIn(List<String> values) {
+            addCriterion("disabled in", values, "disabled");
+            return (Criteria) this;
+        }
+
+        public Criteria andDisabledNotIn(List<String> values) {
+            addCriterion("disabled not in", values, "disabled");
+            return (Criteria) this;
+        }
+
+        public Criteria andDisabledBetween(String value1, String value2) {
+            addCriterion("disabled between", value1, value2, "disabled");
+            return (Criteria) this;
+        }
+
+        public Criteria andDisabledNotBetween(String value1, String value2) {
+            addCriterion("disabled not between", value1, value2, "disabled");
+            return (Criteria) this;
+        }
     }
 
     public static class Criteria extends GeneratedCriteria {

mbg/src/main/java/com/koobietech/eas/mbg/model/EasEduClassroom.java

@@ -1,6 +1,6 @@
 package com.koobietech.eas.mbg.model;
 
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
 import java.io.Serializable;
 import java.util.Date;
 
@@ -12,7 +12,7 @@ public class EasEduClassroom implements Serializable {
      *
      * @mbg.generated
      */
-    @ApiModelProperty(value = "教室名")
+    @Schema(description = "教室名")
     private String name;
 
     /**
@@ -20,7 +20,7 @@ public class EasEduClassroom implements Serializable {
      *
      * @mbg.generated
      */
-    @ApiModelProperty(value = "教室负责人ID")
+    @Schema(description = "教室负责人ID")
     private Integer managerId;
 
     /**
@@ -28,7 +28,7 @@ public class EasEduClassroom implements Serializable {
      *
      * @mbg.generated
      */
-    @ApiModelProperty(value = "教室所在地址")
+    @Schema(description = "教室所在地址")
     private String address;
 
     /**
@@ -36,7 +36,7 @@ public class EasEduClassroom implements Serializable {
      *
      * @mbg.generated
      */
-    @ApiModelProperty(value = "教室负责人")
+    @Schema(description = "教室负责人")
     private String manager;
 
     /**
@@ -44,7 +44,7 @@ public class EasEduClassroom implements Serializable {
      *
      * @mbg.generated
      */
-    @ApiModelProperty(value = "教室所在楼层")
+    @Schema(description = "教室所在楼层")
     private Integer floor;
 
     /**
@@ -52,7 +52,7 @@ public class EasEduClassroom implements Serializable {
      *
      * @mbg.generated
      */
-    @ApiModelProperty(value = "教室的容量")
+    @Schema(description = "教室的容量")
     private Integer capacity;
 
     /**
@@ -60,7 +60,7 @@ public class EasEduClassroom implements Serializable {
      *
      * @mbg.generated
      */
-    @ApiModelProperty(value = "备注信息")
+    @Schema(description = "备注信息")
     private String comment;
 
     /**
@@ -68,7 +68,7 @@ public class EasEduClassroom implements Serializable {
      *
      * @mbg.generated
      */
-    @ApiModelProperty(value = "是否禁用")
+    @Schema(description = "是否禁用")
     private String disabled;
 
     /**
@@ -76,7 +76,7 @@ public class EasEduClassroom implements Serializable {
      *
      * @mbg.generated
      */
-    @ApiModelProperty(value = "创建时间")
+    @Schema(description = "创建时间")
     private Date createTime;
 
     /**
@@ -84,7 +84,7 @@ public class EasEduClassroom implements Serializable {
      *
      * @mbg.generated
      */
-    @ApiModelProperty(value = "修改时间")
+    @Schema(description = "修改时间")
     private Date modifyTime;
 
     /**
@@ -92,7 +92,7 @@ public class EasEduClassroom implements Serializable {
      *
      * @mbg.generated
      */
-    @ApiModelProperty(value = "创建用户ID")
+    @Schema(description = "创建用户ID")
     private Integer createUid;
 
     private static final long serialVersionUID = 1L;

mbg/src/main/java/com/koobietech/eas/mbg/model/EasEduSchedule.java

@@ -1,6 +1,6 @@
 package com.koobietech.eas.mbg.model;
 
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
 import java.io.Serializable;
 import java.util.Date;
 
@@ -12,7 +12,7 @@ public class EasEduSchedule implements Serializable {
      *
      * @mbg.generated
      */
-    @ApiModelProperty(value = "当周周几")
+    @Schema(description = "当周周几")
     private Integer week;
 
     /**
@@ -20,7 +20,7 @@ public class EasEduSchedule implements Serializable {
      *
      * @mbg.generated
      */
-    @ApiModelProperty(value = "起始时间")
+    @Schema(description = "起始时间")
     private Date startTime;
 
     /**
@@ -28,7 +28,7 @@ public class EasEduSchedule implements Serializable {
      *
      * @mbg.generated
      */
-    @ApiModelProperty(value = "结束时间")
+    @Schema(description = "结束时间")
     private Date endTime;
 
     /**
@@ -36,7 +36,7 @@ public class EasEduSchedule implements Serializable {
      *
      * @mbg.generated
      */
-    @ApiModelProperty(value = "教室ID")
+    @Schema(description = "教室ID")
     private Integer roomId;
 
     /**
@@ -44,7 +44,7 @@ public class EasEduSchedule implements Serializable {
      *
      * @mbg.generated
      */
-    @ApiModelProperty(value = "班级ID")
+    @Schema(description = "班级ID")
     private Integer classId;
 
     /**
@@ -52,7 +52,7 @@ public class EasEduSchedule implements Serializable {
      *
      * @mbg.generated
      */
-    @ApiModelProperty(value = "助教ID")
+    @Schema(description = "助教ID")
     private Integer assistantId;
 
     /**
@@ -60,7 +60,7 @@ public class EasEduSchedule implements Serializable {
      *
      * @mbg.generated
      */
-    @ApiModelProperty(value = "教师ID")
+    @Schema(description = "教师ID")
     private Integer teacherId;
 
     /**
@@ -68,7 +68,7 @@ public class EasEduSchedule implements Serializable {
      *
      * @mbg.generated
      */
-    @ApiModelProperty(value = "授课类别")
+    @Schema(description = "授课类别")
     private Integer categoryId;
 
     /**
@@ -76,7 +76,7 @@ public class EasEduSchedule implements Serializable {
      *
      * @mbg.generated
      */
-    @ApiModelProperty(value = "授课内容")
+    @Schema(description = "授课内容")
     private Integer subjectsId;
 
     /**
@@ -84,7 +84,7 @@ public class EasEduSchedule implements Serializable {
      *
      * @mbg.generated
      */
-    @ApiModelProperty(value = "创建时间")
+    @Schema(description = "创建时间")
     private Date createTime;
 
     /**
@@ -92,7 +92,7 @@ public class EasEduSchedule implements Serializable {
      *
      * @mbg.generated
      */
-    @ApiModelProperty(value = "修改时间")
+    @Schema(description = "修改时间")
     private Date modifyTime;
 
     /**
@@ -100,9 +100,17 @@ public class EasEduSchedule implements Serializable {
      *
      * @mbg.generated
      */
-    @ApiModelProperty(value = "创建用户ID")
+    @Schema(description = "创建用户ID")
     private Integer createUid;
 
+    /**
+     * 状态
+     *
+     * @mbg.generated
+     */
+    @Schema(description = "状态")
+    private String disabled;
+
     private static final long serialVersionUID = 1L;
 
     public Long getId() {
@@ -209,6 +217,14 @@ public class EasEduSchedule implements Serializable {
         this.createUid = createUid;
     }
 
+    public String getDisabled() {
+        return disabled;
+    }
+
+    public void setDisabled(String disabled) {
+        this.disabled = disabled;
+    }
+
     @Override
     public String toString() {
         StringBuilder sb = new StringBuilder();
@@ -228,6 +244,7 @@ public class EasEduSchedule implements Serializable {
         sb.append(", createTime=").append(createTime);
         sb.append(", modifyTime=").append(modifyTime);
         sb.append(", createUid=").append(createUid);
+        sb.append(", disabled=").append(disabled);
         sb.append(", serialVersionUID=").append(serialVersionUID);
         sb.append("]");
         return sb.toString();

mbg/src/main/java/com/koobietech/eas/mbg/model/EasEduScheduleExample.java

@@ -884,6 +884,76 @@ public class EasEduScheduleExample {
             addCriterion("create_uid not between", value1, value2, "createUid");
             return (Criteria) this;
         }
+
+        public Criteria andDisabledIsNull() {
+            addCriterion("disabled is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andDisabledIsNotNull() {
+            addCriterion("disabled is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andDisabledEqualTo(String value) {
+            addCriterion("disabled =", value, "disabled");
+            return (Criteria) this;
+        }
+
+        public Criteria andDisabledNotEqualTo(String value) {
+            addCriterion("disabled <>", value, "disabled");
+            return (Criteria) this;
+        }
+
+        public Criteria andDisabledGreaterThan(String value) {
+            addCriterion("disabled >", value, "disabled");
+            return (Criteria) this;
+        }
+
+        public Criteria andDisabledGreaterThanOrEqualTo(String value) {
+            addCriterion("disabled >=", value, "disabled");
+            return (Criteria) this;
+        }
+
+        public Criteria andDisabledLessThan(String value) {
+            addCriterion("disabled <", value, "disabled");
+            return (Criteria) this;
+        }
+
+        public Criteria andDisabledLessThanOrEqualTo(String value) {
+            addCriterion("disabled <=", value, "disabled");
+            return (Criteria) this;
+        }
+
+        public Criteria andDisabledLike(String value) {
+            addCriterion("disabled like", value, "disabled");
+            return (Criteria) this;
+        }
+
+        public Criteria andDisabledNotLike(String value) {
+            addCriterion("disabled not like", value, "disabled");
+            return (Criteria) this;
+        }
+
+        public Criteria andDisabledIn(List<String> values) {
+            addCriterion("disabled in", values, "disabled");
+            return (Criteria) this;
+        }
+
+        public Criteria andDisabledNotIn(List<String> values) {
+            addCriterion("disabled not in", values, "disabled");
+            return (Criteria) this;
+        }
+
+        public Criteria andDisabledBetween(String value1, String value2) {
+            addCriterion("disabled between", value1, value2, "disabled");
+            return (Criteria) this;
+        }
+
+        public Criteria andDisabledNotBetween(String value1, String value2) {
+            addCriterion("disabled not between", value1, value2, "disabled");
+            return (Criteria) this;
+        }
     }
 
     public static class Criteria extends GeneratedCriteria {

mbg/src/main/java/com/koobietech/eas/mbg/model/EasEduSubjects.java

@@ -1,6 +1,6 @@
 package com.koobietech.eas.mbg.model;
 
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
 import java.io.Serializable;
 import java.util.Date;
 
@@ -12,7 +12,7 @@ public class EasEduSubjects implements Serializable {
      *
      * @mbg.generated
      */
-    @ApiModelProperty(value = "学科名称")
+    @Schema(description = "学科名称")
     private String name;
 
     /**
@@ -20,7 +20,7 @@ public class EasEduSubjects implements Serializable {
      *
      * @mbg.generated
      */
-    @ApiModelProperty(value = "学科分类")
+    @Schema(description = "学科分类")
     private String categoryId;
 
     /**
@@ -28,7 +28,7 @@ public class EasEduSubjects implements Serializable {
      *
      * @mbg.generated
      */
-    @ApiModelProperty(value = "创建时间")
+    @Schema(description = "创建时间")
     private Date createTime;
 
     /**
@@ -36,7 +36,7 @@ public class EasEduSubjects implements Serializable {
      *
      * @mbg.generated
      */
-    @ApiModelProperty(value = "修改时间")
+    @Schema(description = "修改时间")
     private Date modifyTime;
 
     /**
@@ -44,15 +44,23 @@ public class EasEduSubjects implements Serializable {
      *
      * @mbg.generated
      */
-    @ApiModelProperty(value = "创建用户ID")
+    @Schema(description = "创建用户ID")
     private Integer createUid;
 
+    /**
+     * 状态
+     *
+     * @mbg.generated
+     */
+    @Schema(description = "状态")
+    private String disabled;
+
     /**
      * 学科描述
      *
      * @mbg.generated
      */
-    @ApiModelProperty(value = "学科描述")
+    @Schema(description = "学科描述")
     private String description;
 
     private static final long serialVersionUID = 1L;
@@ -105,6 +113,14 @@ public class EasEduSubjects implements Serializable {
         this.createUid = createUid;
     }
 
+    public String getDisabled() {
+        return disabled;
+    }
+
+    public void setDisabled(String disabled) {
+        this.disabled = disabled;
+    }
+
     public String getDescription() {
         return description;
     }
@@ -125,6 +141,7 @@ public class EasEduSubjects implements Serializable {
         sb.append(", createTime=").append(createTime);
         sb.append(", modifyTime=").append(modifyTime);
         sb.append(", createUid=").append(createUid);
+        sb.append(", disabled=").append(disabled);
         sb.append(", description=").append(description);
         sb.append(", serialVersionUID=").append(serialVersionUID);
         sb.append("]");

mbg/src/main/java/com/koobietech/eas/mbg/model/EasEduSubjectsExample.java

@@ -484,6 +484,76 @@ public class EasEduSubjectsExample {
             addCriterion("create_uid not between", value1, value2, "createUid");
             return (Criteria) this;
         }
+
+        public Criteria andDisabledIsNull() {
+            addCriterion("disabled is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andDisabledIsNotNull() {
+            addCriterion("disabled is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andDisabledEqualTo(String value) {
+            addCriterion("disabled =", value, "disabled");
+            return (Criteria) this;
+        }
+
+        public Criteria andDisabledNotEqualTo(String value) {
+            addCriterion("disabled <>", value, "disabled");
+            return (Criteria) this;
+        }
+
+        public Criteria andDisabledGreaterThan(String value) {
+            addCriterion("disabled >", value, "disabled");
+            return (Criteria) this;
+        }
+
+        public Criteria andDisabledGreaterThanOrEqualTo(String value) {
+            addCriterion("disabled >=", value, "disabled");
+            return (Criteria) this;
+        }
+
+        public Criteria andDisabledLessThan(String value) {
+            addCriterion("disabled <", value, "disabled");
+            return (Criteria) this;
+        }
+
+        public Criteria andDisabledLessThanOrEqualTo(String value) {
+            addCriterion("disabled <=", value, "disabled");
+            return (Criteria) this;
+        }
+
+        public Criteria andDisabledLike(String value) {
+            addCriterion("disabled like", value, "disabled");
+            return (Criteria) this;
+        }
+
+        public Criteria andDisabledNotLike(String value) {
+            addCriterion("disabled not like", value, "disabled");
+            return (Criteria) this;
+        }
+
+        public Criteria andDisabledIn(List<String> values) {
+            addCriterion("disabled in", values, "disabled");
+            return (Criteria) this;
+        }
+
+        public Criteria andDisabledNotIn(List<String> values) {
+            addCriterion("disabled not in", values, "disabled");
+            return (Criteria) this;
+        }
+
+        public Criteria andDisabledBetween(String value1, String value2) {
+            addCriterion("disabled between", value1, value2, "disabled");
+            return (Criteria) this;
+        }
+
+        public Criteria andDisabledNotBetween(String value1, String value2) {
+            addCriterion("disabled not between", value1, value2, "disabled");
+            return (Criteria) this;
+        }
     }
 
     public static class Criteria extends GeneratedCriteria {

mbg/src/main/java/com/koobietech/eas/mbg/model/EasSysDepRelation.java

@@ -1,6 +1,6 @@
 package com.koobietech.eas.mbg.model;
 
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
 import java.io.Serializable;
 import java.util.Date;
 
@@ -10,7 +10,7 @@ public class EasSysDepRelation implements Serializable {
      *
      * @mbg.generated
      */
-    @ApiModelProperty(value = "ID")
+    @Schema(description = "ID")
     private Integer id;
 
     /**
@@ -18,7 +18,7 @@ public class EasSysDepRelation implements Serializable {
      *
      * @mbg.generated
      */
-    @ApiModelProperty(value = "部门ID")
+    @Schema(description = "部门ID")
     private Integer departmentId;
 
     /**
@@ -26,7 +26,7 @@ public class EasSysDepRelation implements Serializable {
      *
      * @mbg.generated
      */
-    @ApiModelProperty(value = "用户ID")
+    @Schema(description = "用户ID")
     private Integer userId;
 
     /**
@@ -34,7 +34,7 @@ public class EasSysDepRelation implements Serializable {
      *
      * @mbg.generated
      */
-    @ApiModelProperty(value = "学员ID")
+    @Schema(description = "学员ID")
     private Integer studentId;
 
     /**
@@ -42,7 +42,7 @@ public class EasSysDepRelation implements Serializable {
      *
      * @mbg.generated
      */
-    @ApiModelProperty(value = "创建时间")
+    @Schema(description = "创建时间")
     private Date createTime;
 
     /**
@@ -50,7 +50,7 @@ public class EasSysDepRelation implements Serializable {
      *
      * @mbg.generated
      */
-    @ApiModelProperty(value = "创建用户ID")
+    @Schema(description = "创建用户ID")
     private Integer createUid;
 
     private static final long serialVersionUID = 1L;

mbg/src/main/java/com/koobietech/eas/mbg/model/EasSysDepartment.java

@@ -1,6 +1,6 @@
 package com.koobietech.eas.mbg.model;
 
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
 import java.io.Serializable;
 import java.util.Date;
 
@@ -12,7 +12,7 @@ public class EasSysDepartment implements Serializable {
      *
      * @mbg.generated
      */
-    @ApiModelProperty(value = "部门名称")
+    @Schema(description = "部门名称")
     private String depname;
 
     /**
@@ -20,7 +20,7 @@ public class EasSysDepartment implements Serializable {
      *
      * @mbg.generated
      */
-    @ApiModelProperty(value = "部门地址")
+    @Schema(description = "部门地址")
     private String address;
 
     /**
@@ -28,7 +28,7 @@ public class EasSysDepartment implements Serializable {
      *
      * @mbg.generated
      */
-    @ApiModelProperty(value = "部门电话")
+    @Schema(description = "部门电话")
     private String phone;
 
     /**
@@ -36,7 +36,7 @@ public class EasSysDepartment implements Serializable {
      *
      * @mbg.generated
      */
-    @ApiModelProperty(value = "部门电子邮箱")
+    @Schema(description = "部门电子邮箱")
     private String email;
 
     /**
@@ -44,7 +44,7 @@ public class EasSysDepartment implements Serializable {
      *
      * @mbg.generated
      */
-    @ApiModelProperty(value = "部门负责人")
+    @Schema(description = "部门负责人")
     private String manager;
 
     /**
@@ -52,7 +52,7 @@ public class EasSysDepartment implements Serializable {
      *
      * @mbg.generated
      */
-    @ApiModelProperty(value = "创建时间")
+    @Schema(description = "创建时间")
     private Date createTime;
 
     /**
@@ -60,7 +60,7 @@ public class EasSysDepartment implements Serializable {
      *
      * @mbg.generated
      */
-    @ApiModelProperty(value = "修改时间")
+    @Schema(description = "修改时间")
     private Date modifyTime;
 
     /**
@@ -68,9 +68,17 @@ public class EasSysDepartment implements Serializable {
      *
      * @mbg.generated
      */
-    @ApiModelProperty(value = "创建用户ID")
+    @Schema(description = "创建用户ID")
     private Integer createUid;
 
+    /**
+     * 状态
+     *
+     * @mbg.generated
+     */
+    @Schema(description = "状态")
+    private String disabled;
+
     private static final long serialVersionUID = 1L;
 
     public Long getId() {
@@ -145,6 +153,14 @@ public class EasSysDepartment implements Serializable {
         this.createUid = createUid;
     }
 
+    public String getDisabled() {
+        return disabled;
+    }
+
+    public void setDisabled(String disabled) {
+        this.disabled = disabled;
+    }
+
     @Override
     public String toString() {
         StringBuilder sb = new StringBuilder();
@@ -160,6 +176,7 @@ public class EasSysDepartment implements Serializable {
         sb.append(", createTime=").append(createTime);
         sb.append(", modifyTime=").append(modifyTime);
         sb.append(", createUid=").append(createUid);
+        sb.append(", disabled=").append(disabled);
         sb.append(", serialVersionUID=").append(serialVersionUID);
         sb.append("]");
         return sb.toString();

mbg/src/main/java/com/koobietech/eas/mbg/model/EasSysDepartmentExample.java

@@ -694,6 +694,76 @@ public class EasSysDepartmentExample {
             addCriterion("create_uid not between", value1, value2, "createUid");
             return (Criteria) this;
         }
+
+        public Criteria andDisabledIsNull() {
+            addCriterion("disabled is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andDisabledIsNotNull() {
+            addCriterion("disabled is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andDisabledEqualTo(String value) {
+            addCriterion("disabled =", value, "disabled");
+            return (Criteria) this;
+        }
+
+        public Criteria andDisabledNotEqualTo(String value) {
+            addCriterion("disabled <>", value, "disabled");
+            return (Criteria) this;
+        }
+
+        public Criteria andDisabledGreaterThan(String value) {
+            addCriterion("disabled >", value, "disabled");
+            return (Criteria) this;
+        }
+
+        public Criteria andDisabledGreaterThanOrEqualTo(String value) {
+            addCriterion("disabled >=", value, "disabled");
+            return (Criteria) this;
+        }
+
+        public Criteria andDisabledLessThan(String value) {
+            addCriterion("disabled <", value, "disabled");
+            return (Criteria) this;
+        }
+
+        public Criteria andDisabledLessThanOrEqualTo(String value) {
+            addCriterion("disabled <=", value, "disabled");
+            return (Criteria) this;
+        }
+
+        public Criteria andDisabledLike(String value) {
+            addCriterion("disabled like", value, "disabled");
+            return (Criteria) this;
+        }
+
+        public Criteria andDisabledNotLike(String value) {
+            addCriterion("disabled not like", value, "disabled");
+            return (Criteria) this;
+        }
+
+        public Criteria andDisabledIn(List<String> values) {
+            addCriterion("disabled in", values, "disabled");
+            return (Criteria) this;
+        }
+
+        public Criteria andDisabledNotIn(List<String> values) {
+            addCriterion("disabled not in", values, "disabled");
+            return (Criteria) this;
+        }
+
+        public Criteria andDisabledBetween(String value1, String value2) {
+            addCriterion("disabled between", value1, value2, "disabled");
+            return (Criteria) this;
+        }
+
+        public Criteria andDisabledNotBetween(String value1, String value2) {
+            addCriterion("disabled not between", value1, value2, "disabled");
+            return (Criteria) this;
+        }
     }
 
     public static class Criteria extends GeneratedCriteria {

mbg/src/main/java/com/koobietech/eas/mbg/model/EasSystemLogs.java → mbg/src/main/java/com/koobietech/eas/mbg/model/EasSysLogs.java

@@ -1,16 +1,16 @@
 package com.koobietech.eas.mbg.model;
 
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
 import java.io.Serializable;
 import java.util.Date;
 
-public class EasSystemLogs implements Serializable {
+public class EasSysLogs implements Serializable {
     /**
      * 自增的主键
      *
      * @mbg.generated
      */
-    @ApiModelProperty(value = "自增的主键")
+    @Schema(description = "自增的主键")
     private Integer id;
 
     /**
@@ -18,7 +18,7 @@ public class EasSystemLogs implements Serializable {
      *
      * @mbg.generated
      */
-    @ApiModelProperty(value = "记录日志的时间戳")
+    @Schema(description = "记录日志的时间戳")
     private Date timestamp;
 
     /**
@@ -26,7 +26,7 @@ public class EasSystemLogs implements Serializable {
      *
      * @mbg.generated
      */
-    @ApiModelProperty(value = "日志级别")
+    @Schema(description = "日志级别")
     private String level;
 
     /**
@@ -34,7 +34,7 @@ public class EasSystemLogs implements Serializable {
      *
      * @mbg.generated
      */
-    @ApiModelProperty(value = "记录日志的代码名称或类名")
+    @Schema(description = "记录日志的代码名称或类名")
     private String logger;
 
     /**
@@ -42,7 +42,7 @@ public class EasSystemLogs implements Serializable {
      *
      * @mbg.generated
      */
-    @ApiModelProperty(value = "日志信息")
+    @Schema(description = "日志信息")
     private String message;
 
     /**
@@ -50,7 +50,7 @@ public class EasSystemLogs implements Serializable {
      *
      * @mbg.generated
      */
-    @ApiModelProperty(value = "如果日志记录了异常信息，可以将其存储在此列中")
+    @Schema(description = "如果日志记录了异常信息，可以将其存储在此列中")
     private String exception;
 
     private static final long serialVersionUID = 1L;

mbg/src/main/java/com/koobietech/eas/mbg/model/EasSystemLogsExample.java → mbg/src/main/java/com/koobietech/eas/mbg/model/EasSysLogsExample.java

@@ -4,14 +4,14 @@ import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 
-public class EasSystemLogsExample {
+public class EasSysLogsExample {
     protected String orderByClause;
 
     protected boolean distinct;
 
     protected List<Criteria> oredCriteria;
 
-    public EasSystemLogsExample() {
+    public EasSysLogsExample() {
         oredCriteria = new ArrayList<>();
     }
 

mbg/src/main/java/com/koobietech/eas/mbg/model/EasSysPermission.java

@@ -1,6 +1,6 @@
 package com.koobietech.eas.mbg.model;
 
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
 import java.io.Serializable;
 import java.util.Date;
 
@@ -10,7 +10,7 @@ public class EasSysPermission implements Serializable {
      *
      * @mbg.generated
      */
-    @ApiModelProperty(value = "ID")
+    @Schema(description = "ID")
     private Integer id;
 
     /**
@@ -18,7 +18,7 @@ public class EasSysPermission implements Serializable {
      *
      * @mbg.generated
      */
-    @ApiModelProperty(value = "权限名称")
+    @Schema(description = "权限名称")
     private String name;
 
     /**
@@ -26,7 +26,7 @@ public class EasSysPermission implements Serializable {
      *
      * @mbg.generated
      */
-    @ApiModelProperty(value = "是否激活")
+    @Schema(description = "是否激活")
     private Byte isActive;
 
     /**
@@ -34,7 +34,7 @@ public class EasSysPermission implements Serializable {
      *
      * @mbg.generated
      */
-    @ApiModelProperty(value = "创建时间")
+    @Schema(description = "创建时间")
     private Date createTime;
 
     /**
@@ -42,7 +42,7 @@ public class EasSysPermission implements Serializable {
      *
      * @mbg.generated
      */
-    @ApiModelProperty(value = "修改时间")
+    @Schema(description = "修改时间")
     private Date modifyTime;
 
     /**
@@ -50,15 +50,23 @@ public class EasSysPermission implements Serializable {
      *
      * @mbg.generated
      */
-    @ApiModelProperty(value = "创建用户ID")
+    @Schema(description = "创建用户ID")
     private Integer createUid;
 
+    /**
+     * 状态
+     *
+     * @mbg.generated
+     */
+    @Schema(description = "状态")
+    private String disabled;
+
     /**
      * 权限描述
      *
      * @mbg.generated
      */
-    @ApiModelProperty(value = "权限描述")
+    @Schema(description = "权限描述")
     private String description;
 
     private static final long serialVersionUID = 1L;
@@ -111,6 +119,14 @@ public class EasSysPermission implements Serializable {
         this.createUid = createUid;
     }
 
+    public String getDisabled() {
+        return disabled;
+    }
+
+    public void setDisabled(String disabled) {
+        this.disabled = disabled;
+    }
+
     public String getDescription() {
         return description;
     }
@@ -131,6 +147,7 @@ public class EasSysPermission implements Serializable {
         sb.append(", createTime=").append(createTime);
         sb.append(", modifyTime=").append(modifyTime);
         sb.append(", createUid=").append(createUid);
+        sb.append(", disabled=").append(disabled);
         sb.append(", description=").append(description);
         sb.append(", serialVersionUID=").append(serialVersionUID);
         sb.append("]");

mbg/src/main/java/com/koobietech/eas/mbg/model/EasSysPermissionExample.java

@@ -474,6 +474,76 @@ public class EasSysPermissionExample {
             addCriterion("create_uid not between", value1, value2, "createUid");
             return (Criteria) this;
         }
+
+        public Criteria andDisabledIsNull() {
+            addCriterion("disabled is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andDisabledIsNotNull() {
+            addCriterion("disabled is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andDisabledEqualTo(String value) {
+            addCriterion("disabled =", value, "disabled");
+            return (Criteria) this;
+        }
+
+        public Criteria andDisabledNotEqualTo(String value) {
+            addCriterion("disabled <>", value, "disabled");
+            return (Criteria) this;
+        }
+
+        public Criteria andDisabledGreaterThan(String value) {
+            addCriterion("disabled >", value, "disabled");
+            return (Criteria) this;
+        }
+
+        public Criteria andDisabledGreaterThanOrEqualTo(String value) {
+            addCriterion("disabled >=", value, "disabled");
+            return (Criteria) this;
+        }
+
+        public Criteria andDisabledLessThan(String value) {
+            addCriterion("disabled <", value, "disabled");
+            return (Criteria) this;
+        }
+
+        public Criteria andDisabledLessThanOrEqualTo(String value) {
+            addCriterion("disabled <=", value, "disabled");
+            return (Criteria) this;
+        }
+
+        public Criteria andDisabledLike(String value) {
+            addCriterion("disabled like", value, "disabled");
+            return (Criteria) this;
+        }
+
+        public Criteria andDisabledNotLike(String value) {
+            addCriterion("disabled not like", value, "disabled");
+            return (Criteria) this;
+        }
+
+        public Criteria andDisabledIn(List<String> values) {
+            addCriterion("disabled in", values, "disabled");
+            return (Criteria) this;
+        }
+
+        public Criteria andDisabledNotIn(List<String> values) {
+            addCriterion("disabled not in", values, "disabled");
+            return (Criteria) this;
+        }
+
+        public Criteria andDisabledBetween(String value1, String value2) {
+            addCriterion("disabled between", value1, value2, "disabled");
+            return (Criteria) this;
+        }
+
+        public Criteria andDisabledNotBetween(String value1, String value2) {
+            addCriterion("disabled not between", value1, value2, "disabled");
+            return (Criteria) this;
+        }
     }
 
     public static class Criteria extends GeneratedCriteria {

mbg/src/main/java/com/koobietech/eas/mbg/model/EasSysPesRelation.java

@@ -1,6 +1,6 @@
 package com.koobietech.eas.mbg.model;
 
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
 import java.io.Serializable;
 import java.util.Date;
 
@@ -10,7 +10,7 @@ public class EasSysPesRelation implements Serializable {
      *
      * @mbg.generated
      */
-    @ApiModelProperty(value = "ID")
+    @Schema(description = "ID")
     private Integer id;
 
     /**
@@ -18,7 +18,7 @@ public class EasSysPesRelation implements Serializable {
      *
      * @mbg.generated
      */
-    @ApiModelProperty(value = "权限ID")
+    @Schema(description = "权限ID")
     private Integer permissionId;
 
     /**
@@ -26,15 +26,15 @@ public class EasSysPesRelation implements Serializable {
      *
      * @mbg.generated
      */
-    @ApiModelProperty(value = "角色ID")
-    private Integer depId;
+    @Schema(description = "角色ID")
+    private Integer departmentId;
 
     /**
      * 创建时间
      *
      * @mbg.generated
      */
-    @ApiModelProperty(value = "创建时间")
+    @Schema(description = "创建时间")
     private Date createTime;
 
     /**
@@ -42,7 +42,7 @@ public class EasSysPesRelation implements Serializable {
      *
      * @mbg.generated
      */
-    @ApiModelProperty(value = "创建用户ID")
+    @Schema(description = "创建用户ID")
     private Integer createUid;
 
     private static final long serialVersionUID = 1L;
@@ -63,12 +63,12 @@ public class EasSysPesRelation implements Serializable {
         this.permissionId = permissionId;
     }
 
-    public Integer getDepId() {
-        return depId;
+    public Integer getDepartmentId() {
+        return departmentId;
     }
 
-    public void setDepId(Integer depId) {
-        this.depId = depId;
+    public void setDepartmentId(Integer departmentId) {
+        this.departmentId = departmentId;
     }
 
     public Date getCreateTime() {
@@ -95,7 +95,7 @@ public class EasSysPesRelation implements Serializable {
         sb.append("Hash = ").append(hashCode());
         sb.append(", id=").append(id);
         sb.append(", permissionId=").append(permissionId);
-        sb.append(", depId=").append(depId);
+        sb.append(", departmentId=").append(departmentId);
         sb.append(", createTime=").append(createTime);
         sb.append(", createUid=").append(createUid);
         sb.append(", serialVersionUID=").append(serialVersionUID);

mbg/src/main/java/com/koobietech/eas/mbg/model/EasSysPesRelationExample.java

@@ -225,63 +225,63 @@ public class EasSysPesRelationExample {
             return (Criteria) this;
         }
 
-        public Criteria andDepIdIsNull() {
-            addCriterion("dep_id is null");
+        public Criteria andDepartmentIdIsNull() {
+            addCriterion("department_id is null");
             return (Criteria) this;
         }
 
-        public Criteria andDepIdIsNotNull() {
-            addCriterion("dep_id is not null");
+        public Criteria andDepartmentIdIsNotNull() {
+            addCriterion("department_id is not null");
             return (Criteria) this;
         }
 
-        public Criteria andDepIdEqualTo(Integer value) {
-            addCriterion("dep_id =", value, "depId");
+        public Criteria andDepartmentIdEqualTo(Integer value) {
+            addCriterion("department_id =", value, "departmentId");
             return (Criteria) this;
         }
 
-        public Criteria andDepIdNotEqualTo(Integer value) {
-            addCriterion("dep_id <>", value, "depId");
+        public Criteria andDepartmentIdNotEqualTo(Integer value) {
+            addCriterion("department_id <>", value, "departmentId");
             return (Criteria) this;
         }
 
-        public Criteria andDepIdGreaterThan(Integer value) {
-            addCriterion("dep_id >", value, "depId");
+        public Criteria andDepartmentIdGreaterThan(Integer value) {
+            addCriterion("department_id >", value, "departmentId");
             return (Criteria) this;
         }
 
-        public Criteria andDepIdGreaterThanOrEqualTo(Integer value) {
-            addCriterion("dep_id >=", value, "depId");
+        public Criteria andDepartmentIdGreaterThanOrEqualTo(Integer value) {
+            addCriterion("department_id >=", value, "departmentId");
             return (Criteria) this;
         }
 
-        public Criteria andDepIdLessThan(Integer value) {
-            addCriterion("dep_id <", value, "depId");
+        public Criteria andDepartmentIdLessThan(Integer value) {
+            addCriterion("department_id <", value, "departmentId");
             return (Criteria) this;
         }
 
-        public Criteria andDepIdLessThanOrEqualTo(Integer value) {
-            addCriterion("dep_id <=", value, "depId");
+        public Criteria andDepartmentIdLessThanOrEqualTo(Integer value) {
+            addCriterion("department_id <=", value, "departmentId");
             return (Criteria) this;
         }
 
-        public Criteria andDepIdIn(List<Integer> values) {
-            addCriterion("dep_id in", values, "depId");
+        public Criteria andDepartmentIdIn(List<Integer> values) {
+            addCriterion("department_id in", values, "departmentId");
             return (Criteria) this;
         }
 
-        public Criteria andDepIdNotIn(List<Integer> values) {
-            addCriterion("dep_id not in", values, "depId");
+        public Criteria andDepartmentIdNotIn(List<Integer> values) {
+            addCriterion("department_id not in", values, "departmentId");
             return (Criteria) this;
         }
 
-        public Criteria andDepIdBetween(Integer value1, Integer value2) {
-            addCriterion("dep_id between", value1, value2, "depId");
+        public Criteria andDepartmentIdBetween(Integer value1, Integer value2) {
+            addCriterion("department_id between", value1, value2, "departmentId");
             return (Criteria) this;
         }
 
-        public Criteria andDepIdNotBetween(Integer value1, Integer value2) {
-            addCriterion("dep_id not between", value1, value2, "depId");
+        public Criteria andDepartmentIdNotBetween(Integer value1, Integer value2) {
+            addCriterion("department_id not between", value1, value2, "departmentId");
             return (Criteria) this;
         }
 

mbg/src/main/java/com/koobietech/eas/mbg/model/EasSysStudent.java

@@ -1,6 +1,6 @@
 package com.koobietech.eas.mbg.model;
 
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
 import java.io.Serializable;
 import java.util.Date;
 
@@ -12,7 +12,7 @@ public class EasSysStudent implements Serializable {
      *
      * @mbg.generated
      */
-    @ApiModelProperty(value = "学员档案号")
+    @Schema(description = "学员档案号")
     private String studentNumber;
 
     /**
@@ -20,7 +20,7 @@ public class EasSysStudent implements Serializable {
      *
      * @mbg.generated
      */
-    @ApiModelProperty(value = "学生姓名")
+    @Schema(description = "学生姓名")
     private String studentName;
 
     /**
@@ -28,7 +28,7 @@ public class EasSysStudent implements Serializable {
      *
      * @mbg.generated
      */
-    @ApiModelProperty(value = "学生性别")
+    @Schema(description = "学生性别")
     private String gender;
 
     /**
@@ -36,7 +36,7 @@ public class EasSysStudent implements Serializable {
      *
      * @mbg.generated
      */
-    @ApiModelProperty(value = "学生联系电话")
+    @Schema(description = "学生联系电话")
     private String phone;
 
     /**
@@ -44,7 +44,7 @@ public class EasSysStudent implements Serializable {
      *
      * @mbg.generated
      */
-    @ApiModelProperty(value = "学生电子邮箱")
+    @Schema(description = "学生电子邮箱")
     private String email;
 
     /**
@@ -52,7 +52,7 @@ public class EasSysStudent implements Serializable {
      *
      * @mbg.generated
      */
-    @ApiModelProperty(value = "学生入学日期")
+    @Schema(description = "学生入学日期")
     private Date enrollmentDate;
 
     /**
@@ -60,7 +60,7 @@ public class EasSysStudent implements Serializable {
      *
      * @mbg.generated
      */
-    @ApiModelProperty(value = "学生密码")
+    @Schema(description = "学生密码")
     private String passwd;
 
     /**
@@ -68,7 +68,7 @@ public class EasSysStudent implements Serializable {
      *
      * @mbg.generated
      */
-    @ApiModelProperty(value = "创建时间")
+    @Schema(description = "创建时间")
     private Date createTime;
 
     /**
@@ -76,7 +76,7 @@ public class EasSysStudent implements Serializable {
      *
      * @mbg.generated
      */
-    @ApiModelProperty(value = "修改时间")
+    @Schema(description = "修改时间")
     private Date modifyTime;
 
     /**
@@ -84,7 +84,7 @@ public class EasSysStudent implements Serializable {
      *
      * @mbg.generated
      */
-    @ApiModelProperty(value = "招生老师")
+    @Schema(description = "招生老师")
     private Integer admissionsId;
 
     /**
@@ -92,7 +92,7 @@ public class EasSysStudent implements Serializable {
      *
      * @mbg.generated
      */
-    @ApiModelProperty(value = "直属负责人ID")
+    @Schema(description = "直属负责人ID")
     private Integer managerId;
 
     /**
@@ -100,9 +100,17 @@ public class EasSysStudent implements Serializable {
      *
      * @mbg.generated
      */
-    @ApiModelProperty(value = "创建用户ID")
+    @Schema(description = "创建用户ID")
     private Integer createUid;
 
+    /**
+     * 状态
+     *
+     * @mbg.generated
+     */
+    @Schema(description = "状态")
+    private String disabled;
+
     private static final long serialVersionUID = 1L;
 
     public Long getId() {
@@ -209,6 +217,14 @@ public class EasSysStudent implements Serializable {
         this.createUid = createUid;
     }
 
+    public String getDisabled() {
+        return disabled;
+    }
+
+    public void setDisabled(String disabled) {
+        this.disabled = disabled;
+    }
+
     @Override
     public String toString() {
         StringBuilder sb = new StringBuilder();
@@ -228,6 +244,7 @@ public class EasSysStudent implements Serializable {
         sb.append(", admissionsId=").append(admissionsId);
         sb.append(", managerId=").append(managerId);
         sb.append(", createUid=").append(createUid);
+        sb.append(", disabled=").append(disabled);
         sb.append(", serialVersionUID=").append(serialVersionUID);
         sb.append("]");
         return sb.toString();

mbg/src/main/java/com/koobietech/eas/mbg/model/EasSysStudentExample.java

@@ -971,6 +971,76 @@ public class EasSysStudentExample {
             addCriterion("create_uid not between", value1, value2, "createUid");
             return (Criteria) this;
         }
+
+        public Criteria andDisabledIsNull() {
+            addCriterion("disabled is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andDisabledIsNotNull() {
+            addCriterion("disabled is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andDisabledEqualTo(String value) {
+            addCriterion("disabled =", value, "disabled");
+            return (Criteria) this;
+        }
+
+        public Criteria andDisabledNotEqualTo(String value) {
+            addCriterion("disabled <>", value, "disabled");
+            return (Criteria) this;
+        }
+
+        public Criteria andDisabledGreaterThan(String value) {
+            addCriterion("disabled >", value, "disabled");
+            return (Criteria) this;
+        }
+
+        public Criteria andDisabledGreaterThanOrEqualTo(String value) {
+            addCriterion("disabled >=", value, "disabled");
+            return (Criteria) this;
+        }
+
+        public Criteria andDisabledLessThan(String value) {
+            addCriterion("disabled <", value, "disabled");
+            return (Criteria) this;
+        }
+
+        public Criteria andDisabledLessThanOrEqualTo(String value) {
+            addCriterion("disabled <=", value, "disabled");
+            return (Criteria) this;
+        }
+
+        public Criteria andDisabledLike(String value) {
+            addCriterion("disabled like", value, "disabled");
+            return (Criteria) this;
+        }
+
+        public Criteria andDisabledNotLike(String value) {
+            addCriterion("disabled not like", value, "disabled");
+            return (Criteria) this;
+        }
+
+        public Criteria andDisabledIn(List<String> values) {
+            addCriterion("disabled in", values, "disabled");
+            return (Criteria) this;
+        }
+
+        public Criteria andDisabledNotIn(List<String> values) {
+            addCriterion("disabled not in", values, "disabled");
+            return (Criteria) this;
+        }
+
+        public Criteria andDisabledBetween(String value1, String value2) {
+            addCriterion("disabled between", value1, value2, "disabled");
+            return (Criteria) this;
+        }
+
+        public Criteria andDisabledNotBetween(String value1, String value2) {
+            addCriterion("disabled not between", value1, value2, "disabled");
+            return (Criteria) this;
+        }
     }
 
     public static class Criteria extends GeneratedCriteria {

mbg/src/main/java/com/koobietech/eas/mbg/model/EasSysUserinfo.java

@@ -1,6 +1,6 @@
 package com.koobietech.eas.mbg.model;
 
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
 import java.io.Serializable;
 import java.util.Date;
 
@@ -10,7 +10,7 @@ public class EasSysUserinfo implements Serializable {
      *
      * @mbg.generated
      */
-    @ApiModelProperty(value = "用户ID")
+    @Schema(description = "用户ID")
     private Long id;
 
     /**
@@ -18,7 +18,7 @@ public class EasSysUserinfo implements Serializable {
      *
      * @mbg.generated
      */
-    @ApiModelProperty(value = "用户名")
+    @Schema(description = "用户名")
     private String username;
 
     /**
@@ -26,7 +26,7 @@ public class EasSysUserinfo implements Serializable {
      *
      * @mbg.generated
      */
-    @ApiModelProperty(value = "密码")
+    @Schema(description = "密码")
     private String passwd;
 
     /**
@@ -34,7 +34,7 @@ public class EasSysUserinfo implements Serializable {
      *
      * @mbg.generated
      */
-    @ApiModelProperty(value = "电子邮件")
+    @Schema(description = "电子邮件")
     private String email;
 
     /**
@@ -42,7 +42,7 @@ public class EasSysUserinfo implements Serializable {
      *
      * @mbg.generated
      */
-    @ApiModelProperty(value = "姓名")
+    @Schema(description = "姓名")
     private String relname;
 
     /**
@@ -50,7 +50,7 @@ public class EasSysUserinfo implements Serializable {
      *
      * @mbg.generated
      */
-    @ApiModelProperty(value = "电话")
+    @Schema(description = "电话")
     private String phone;
 
     /**
@@ -58,7 +58,7 @@ public class EasSysUserinfo implements Serializable {
      *
      * @mbg.generated
      */
-    @ApiModelProperty(value = "地址")
+    @Schema(description = "地址")
     private String address;
 
     /**
@@ -66,7 +66,7 @@ public class EasSysUserinfo implements Serializable {
      *
      * @mbg.generated
      */
-    @ApiModelProperty(value = "创建时间")
+    @Schema(description = "创建时间")
     private Date createTime;
 
     /**
@@ -74,7 +74,7 @@ public class EasSysUserinfo implements Serializable {
      *
      * @mbg.generated
      */
-    @ApiModelProperty(value = "修改时间")
+    @Schema(description = "修改时间")
     private Date modifyTime;
 
     /**
@@ -82,9 +82,17 @@ public class EasSysUserinfo implements Serializable {
      *
      * @mbg.generated
      */
-    @ApiModelProperty(value = "创建用户ID")
+    @Schema(description = "创建用户ID")
     private Integer createUid;
 
+    /**
+     * 状态
+     *
+     * @mbg.generated
+     */
+    @Schema(description = "状态")
+    private String disabled;
+
     private static final long serialVersionUID = 1L;
 
     public Long getId() {
@@ -167,6 +175,14 @@ public class EasSysUserinfo implements Serializable {
         this.createUid = createUid;
     }
 
+    public String getDisabled() {
+        return disabled;
+    }
+
+    public void setDisabled(String disabled) {
+        this.disabled = disabled;
+    }
+
     @Override
     public String toString() {
         StringBuilder sb = new StringBuilder();
@@ -183,6 +199,7 @@ public class EasSysUserinfo implements Serializable {
         sb.append(", createTime=").append(createTime);
         sb.append(", modifyTime=").append(modifyTime);
         sb.append(", createUid=").append(createUid);
+        sb.append(", disabled=").append(disabled);
         sb.append(", serialVersionUID=").append(serialVersionUID);
         sb.append("]");
         return sb.toString();

mbg/src/main/java/com/koobietech/eas/mbg/model/EasSysUserinfoExample.java

@@ -764,6 +764,76 @@ public class EasSysUserinfoExample {
             addCriterion("create_uid not between", value1, value2, "createUid");
             return (Criteria) this;
         }
+
+        public Criteria andDisabledIsNull() {
+            addCriterion("disabled is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andDisabledIsNotNull() {
+            addCriterion("disabled is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andDisabledEqualTo(String value) {
+            addCriterion("disabled =", value, "disabled");
+            return (Criteria) this;
+        }
+
+        public Criteria andDisabledNotEqualTo(String value) {
+            addCriterion("disabled <>", value, "disabled");
+            return (Criteria) this;
+        }
+
+        public Criteria andDisabledGreaterThan(String value) {
+            addCriterion("disabled >", value, "disabled");
+            return (Criteria) this;
+        }
+
+        public Criteria andDisabledGreaterThanOrEqualTo(String value) {
+            addCriterion("disabled >=", value, "disabled");
+            return (Criteria) this;
+        }
+
+        public Criteria andDisabledLessThan(String value) {
+            addCriterion("disabled <", value, "disabled");
+            return (Criteria) this;
+        }
+
+        public Criteria andDisabledLessThanOrEqualTo(String value) {
+            addCriterion("disabled <=", value, "disabled");
+            return (Criteria) this;
+        }
+
+        public Criteria andDisabledLike(String value) {
+            addCriterion("disabled like", value, "disabled");
+            return (Criteria) this;
+        }
+
+        public Criteria andDisabledNotLike(String value) {
+            addCriterion("disabled not like", value, "disabled");
+            return (Criteria) this;
+        }
+
+        public Criteria andDisabledIn(List<String> values) {
+            addCriterion("disabled in", values, "disabled");
+            return (Criteria) this;
+        }
+
+        public Criteria andDisabledNotIn(List<String> values) {
+            addCriterion("disabled not in", values, "disabled");
+            return (Criteria) this;
+        }
+
+        public Criteria andDisabledBetween(String value1, String value2) {
+            addCriterion("disabled between", value1, value2, "disabled");
+            return (Criteria) this;
+        }
+
+        public Criteria andDisabledNotBetween(String value1, String value2) {
+            addCriterion("disabled not between", value1, value2, "disabled");
+            return (Criteria) this;
+        }
     }
 
     public static class Criteria extends GeneratedCriteria {

mbg/src/main/resources/com/koobietech/eas/mbg/mapper/EasArcTlsAttendanceMapper.xml

@@ -10,6 +10,8 @@
     <result column="afternoon" jdbcType="CHAR" property="afternoon" />
     <result column="student_number" jdbcType="VARCHAR" property="studentNumber" />
     <result column="create_uid" jdbcType="INTEGER" property="createUid" />
+    <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
+    <result column="modify_time" jdbcType="TIMESTAMP" property="modifyTime" />
   </resultMap>
   <sql id="Example_Where_Clause">
     <where>
@@ -70,7 +72,8 @@
     </where>
   </sql>
   <sql id="Base_Column_List">
-    id, checkin_date, schedule_id, month, morning, afternoon, student_number, create_uid
+    id, checkin_date, schedule_id, month, morning, afternoon, student_number, create_uid, 
+    create_time, modify_time
   </sql>
   <select id="selectByExample" parameterType="com.koobietech.eas.mbg.model.EasArcTlsAttendanceExample" resultMap="BaseResultMap">
     select
@@ -108,10 +111,12 @@
     </selectKey>
     insert into eas_arc_tls_attendance (checkin_date, schedule_id, month, 
       morning, afternoon, student_number, 
-      create_uid)
+      create_uid, create_time, modify_time
+      )
     values (#{checkinDate,jdbcType=DATE}, #{scheduleId,jdbcType=INTEGER}, #{month,jdbcType=INTEGER}, 
       #{morning,jdbcType=CHAR}, #{afternoon,jdbcType=CHAR}, #{studentNumber,jdbcType=VARCHAR}, 
-      #{createUid,jdbcType=INTEGER})
+      #{createUid,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}, #{modifyTime,jdbcType=TIMESTAMP}
+      )
   </insert>
   <insert id="insertSelective" parameterType="com.koobietech.eas.mbg.model.EasArcTlsAttendance">
     <selectKey keyProperty="id" order="AFTER" resultType="java.lang.Long">
@@ -140,6 +145,12 @@
       <if test="createUid != null">
         create_uid,
       </if>
+      <if test="createTime != null">
+        create_time,
+      </if>
+      <if test="modifyTime != null">
+        modify_time,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="checkinDate != null">
@@ -163,6 +174,12 @@
       <if test="createUid != null">
         #{createUid,jdbcType=INTEGER},
       </if>
+      <if test="createTime != null">
+        #{createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="modifyTime != null">
+        #{modifyTime,jdbcType=TIMESTAMP},
+      </if>
     </trim>
   </insert>
   <select id="countByExample" parameterType="com.koobietech.eas.mbg.model.EasArcTlsAttendanceExample" resultType="java.lang.Long">
@@ -198,6 +215,12 @@
       <if test="record.createUid != null">
         create_uid = #{record.createUid,jdbcType=INTEGER},
       </if>
+      <if test="record.createTime != null">
+        create_time = #{record.createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.modifyTime != null">
+        modify_time = #{record.modifyTime,jdbcType=TIMESTAMP},
+      </if>
     </set>
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
@@ -212,7 +235,9 @@
       morning = #{record.morning,jdbcType=CHAR},
       afternoon = #{record.afternoon,jdbcType=CHAR},
       student_number = #{record.studentNumber,jdbcType=VARCHAR},
-      create_uid = #{record.createUid,jdbcType=INTEGER}
+      create_uid = #{record.createUid,jdbcType=INTEGER},
+      create_time = #{record.createTime,jdbcType=TIMESTAMP},
+      modify_time = #{record.modifyTime,jdbcType=TIMESTAMP}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -241,6 +266,12 @@
       <if test="createUid != null">
         create_uid = #{createUid,jdbcType=INTEGER},
       </if>
+      <if test="createTime != null">
+        create_time = #{createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="modifyTime != null">
+        modify_time = #{modifyTime,jdbcType=TIMESTAMP},
+      </if>
     </set>
     where id = #{id,jdbcType=BIGINT}
   </update>
@@ -252,7 +283,9 @@
       morning = #{morning,jdbcType=CHAR},
       afternoon = #{afternoon,jdbcType=CHAR},
       student_number = #{studentNumber,jdbcType=VARCHAR},
-      create_uid = #{createUid,jdbcType=INTEGER}
+      create_uid = #{createUid,jdbcType=INTEGER},
+      create_time = #{createTime,jdbcType=TIMESTAMP},
+      modify_time = #{modifyTime,jdbcType=TIMESTAMP}
     where id = #{id,jdbcType=BIGINT}
   </update>
 </mapper>

mbg/src/main/resources/com/koobietech/eas/mbg/mapper/EasEduCategoryMapper.xml

@@ -7,6 +7,7 @@
     <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
     <result column="modify_time" jdbcType="TIMESTAMP" property="modifyTime" />
     <result column="create_uid" jdbcType="INTEGER" property="createUid" />
+    <result column="disabled" jdbcType="CHAR" property="disabled" />
   </resultMap>
   <resultMap extends="BaseResultMap" id="ResultMapWithBLOBs" type="com.koobietech.eas.mbg.model.EasEduCategory">
     <result column="description" jdbcType="LONGVARCHAR" property="description" />
@@ -70,7 +71,7 @@
     </where>
   </sql>
   <sql id="Base_Column_List">
-    id, name, create_time, modify_time, create_uid
+    id, name, create_time, modify_time, create_uid, disabled
   </sql>
   <sql id="Blob_Column_List">
     description
@@ -128,9 +129,11 @@
       SELECT LAST_INSERT_ID()
     </selectKey>
     insert into eas_edu_category (name, create_time, modify_time, 
-      create_uid, description)
+      create_uid, disabled, description
+      )
     values (#{name,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, #{modifyTime,jdbcType=TIMESTAMP}, 
-      #{createUid,jdbcType=INTEGER}, #{description,jdbcType=LONGVARCHAR})
+      #{createUid,jdbcType=INTEGER}, #{disabled,jdbcType=CHAR}, #{description,jdbcType=LONGVARCHAR}
+      )
   </insert>
   <insert id="insertSelective" parameterType="com.koobietech.eas.mbg.model.EasEduCategory">
     <selectKey keyProperty="id" order="AFTER" resultType="java.lang.Integer">
@@ -150,6 +153,9 @@
       <if test="createUid != null">
         create_uid,
       </if>
+      <if test="disabled != null">
+        disabled,
+      </if>
       <if test="description != null">
         description,
       </if>
@@ -167,6 +173,9 @@
       <if test="createUid != null">
         #{createUid,jdbcType=INTEGER},
       </if>
+      <if test="disabled != null">
+        #{disabled,jdbcType=CHAR},
+      </if>
       <if test="description != null">
         #{description,jdbcType=LONGVARCHAR},
       </if>
@@ -196,6 +205,9 @@
       <if test="record.createUid != null">
         create_uid = #{record.createUid,jdbcType=INTEGER},
       </if>
+      <if test="record.disabled != null">
+        disabled = #{record.disabled,jdbcType=CHAR},
+      </if>
       <if test="record.description != null">
         description = #{record.description,jdbcType=LONGVARCHAR},
       </if>
@@ -211,6 +223,7 @@
       create_time = #{record.createTime,jdbcType=TIMESTAMP},
       modify_time = #{record.modifyTime,jdbcType=TIMESTAMP},
       create_uid = #{record.createUid,jdbcType=INTEGER},
+      disabled = #{record.disabled,jdbcType=CHAR},
       description = #{record.description,jdbcType=LONGVARCHAR}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
@@ -222,7 +235,8 @@
       name = #{record.name,jdbcType=VARCHAR},
       create_time = #{record.createTime,jdbcType=TIMESTAMP},
       modify_time = #{record.modifyTime,jdbcType=TIMESTAMP},
-      create_uid = #{record.createUid,jdbcType=INTEGER}
+      create_uid = #{record.createUid,jdbcType=INTEGER},
+      disabled = #{record.disabled,jdbcType=CHAR}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -242,6 +256,9 @@
       <if test="createUid != null">
         create_uid = #{createUid,jdbcType=INTEGER},
       </if>
+      <if test="disabled != null">
+        disabled = #{disabled,jdbcType=CHAR},
+      </if>
       <if test="description != null">
         description = #{description,jdbcType=LONGVARCHAR},
       </if>
@@ -254,6 +271,7 @@
       create_time = #{createTime,jdbcType=TIMESTAMP},
       modify_time = #{modifyTime,jdbcType=TIMESTAMP},
       create_uid = #{createUid,jdbcType=INTEGER},
+      disabled = #{disabled,jdbcType=CHAR},
       description = #{description,jdbcType=LONGVARCHAR}
     where id = #{id,jdbcType=INTEGER}
   </update>
@@ -262,7 +280,8 @@
     set name = #{name,jdbcType=VARCHAR},
       create_time = #{createTime,jdbcType=TIMESTAMP},
       modify_time = #{modifyTime,jdbcType=TIMESTAMP},
-      create_uid = #{createUid,jdbcType=INTEGER}
+      create_uid = #{createUid,jdbcType=INTEGER},
+      disabled = #{disabled,jdbcType=CHAR}
     where id = #{id,jdbcType=INTEGER}
   </update>
 </mapper>

mbg/src/main/resources/com/koobietech/eas/mbg/mapper/EasEduClassMapper.xml

@@ -9,6 +9,7 @@
     <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
     <result column="modify_time" jdbcType="TIMESTAMP" property="modifyTime" />
     <result column="create_uid" jdbcType="INTEGER" property="createUid" />
+    <result column="disabled" jdbcType="CHAR" property="disabled" />
   </resultMap>
   <sql id="Example_Where_Clause">
     <where>
@@ -69,7 +70,7 @@
     </where>
   </sql>
   <sql id="Base_Column_List">
-    id, name, manage_id, assistant_id, create_time, modify_time, create_uid
+    id, name, manage_id, assistant_id, create_time, modify_time, create_uid, disabled
   </sql>
   <select id="selectByExample" parameterType="com.koobietech.eas.mbg.model.EasEduClassExample" resultMap="BaseResultMap">
     select
@@ -106,11 +107,11 @@
       SELECT LAST_INSERT_ID()
     </selectKey>
     insert into eas_edu_class (name, manage_id, assistant_id, 
-      create_time, modify_time, create_uid
-      )
+      create_time, modify_time, create_uid, 
+      disabled)
     values (#{name,jdbcType=VARCHAR}, #{manageId,jdbcType=INTEGER}, #{assistantId,jdbcType=INTEGER}, 
-      #{createTime,jdbcType=TIMESTAMP}, #{modifyTime,jdbcType=TIMESTAMP}, #{createUid,jdbcType=INTEGER}
-      )
+      #{createTime,jdbcType=TIMESTAMP}, #{modifyTime,jdbcType=TIMESTAMP}, #{createUid,jdbcType=INTEGER}, 
+      #{disabled,jdbcType=CHAR})
   </insert>
   <insert id="insertSelective" parameterType="com.koobietech.eas.mbg.model.EasEduClass">
     <selectKey keyProperty="id" order="AFTER" resultType="java.lang.Long">
@@ -136,6 +137,9 @@
       <if test="createUid != null">
         create_uid,
       </if>
+      <if test="disabled != null">
+        disabled,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="name != null">
@@ -156,6 +160,9 @@
       <if test="createUid != null">
         #{createUid,jdbcType=INTEGER},
       </if>
+      <if test="disabled != null">
+        #{disabled,jdbcType=CHAR},
+      </if>
     </trim>
   </insert>
   <select id="countByExample" parameterType="com.koobietech.eas.mbg.model.EasEduClassExample" resultType="java.lang.Long">
@@ -188,6 +195,9 @@
       <if test="record.createUid != null">
         create_uid = #{record.createUid,jdbcType=INTEGER},
       </if>
+      <if test="record.disabled != null">
+        disabled = #{record.disabled,jdbcType=CHAR},
+      </if>
     </set>
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
@@ -201,7 +211,8 @@
       assistant_id = #{record.assistantId,jdbcType=INTEGER},
       create_time = #{record.createTime,jdbcType=TIMESTAMP},
       modify_time = #{record.modifyTime,jdbcType=TIMESTAMP},
-      create_uid = #{record.createUid,jdbcType=INTEGER}
+      create_uid = #{record.createUid,jdbcType=INTEGER},
+      disabled = #{record.disabled,jdbcType=CHAR}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -227,6 +238,9 @@
       <if test="createUid != null">
         create_uid = #{createUid,jdbcType=INTEGER},
       </if>
+      <if test="disabled != null">
+        disabled = #{disabled,jdbcType=CHAR},
+      </if>
     </set>
     where id = #{id,jdbcType=BIGINT}
   </update>
@@ -237,7 +251,8 @@
       assistant_id = #{assistantId,jdbcType=INTEGER},
       create_time = #{createTime,jdbcType=TIMESTAMP},
       modify_time = #{modifyTime,jdbcType=TIMESTAMP},
-      create_uid = #{createUid,jdbcType=INTEGER}
+      create_uid = #{createUid,jdbcType=INTEGER},
+      disabled = #{disabled,jdbcType=CHAR}
     where id = #{id,jdbcType=BIGINT}
   </update>
 </mapper>

mbg/src/main/resources/com/koobietech/eas/mbg/mapper/EasEduScheduleMapper.xml

@@ -15,6 +15,7 @@
     <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
     <result column="modify_time" jdbcType="TIMESTAMP" property="modifyTime" />
     <result column="create_uid" jdbcType="INTEGER" property="createUid" />
+    <result column="disabled" jdbcType="CHAR" property="disabled" />
   </resultMap>
   <sql id="Example_Where_Clause">
     <where>
@@ -76,7 +77,7 @@
   </sql>
   <sql id="Base_Column_List">
     id, week, start_time, end_time, room_id, class_id, assistant_id, teacher_id, category_id, 
-    subjects_id, create_time, modify_time, create_uid
+    subjects_id, create_time, modify_time, create_uid, disabled
   </sql>
   <select id="selectByExample" parameterType="com.koobietech.eas.mbg.model.EasEduScheduleExample" resultMap="BaseResultMap">
     select
@@ -115,13 +116,13 @@
     insert into eas_edu_schedule (week, start_time, end_time, 
       room_id, class_id, assistant_id, 
       teacher_id, category_id, subjects_id, 
-      create_time, modify_time, create_uid
-      )
+      create_time, modify_time, create_uid, 
+      disabled)
     values (#{week,jdbcType=INTEGER}, #{startTime,jdbcType=TIMESTAMP}, #{endTime,jdbcType=TIMESTAMP}, 
       #{roomId,jdbcType=INTEGER}, #{classId,jdbcType=INTEGER}, #{assistantId,jdbcType=INTEGER}, 
       #{teacherId,jdbcType=INTEGER}, #{categoryId,jdbcType=INTEGER}, #{subjectsId,jdbcType=INTEGER}, 
-      #{createTime,jdbcType=TIMESTAMP}, #{modifyTime,jdbcType=TIMESTAMP}, #{createUid,jdbcType=INTEGER}
-      )
+      #{createTime,jdbcType=TIMESTAMP}, #{modifyTime,jdbcType=TIMESTAMP}, #{createUid,jdbcType=INTEGER}, 
+      #{disabled,jdbcType=CHAR})
   </insert>
   <insert id="insertSelective" parameterType="com.koobietech.eas.mbg.model.EasEduSchedule">
     <selectKey keyProperty="id" order="AFTER" resultType="java.lang.Long">
@@ -165,6 +166,9 @@
       <if test="createUid != null">
         create_uid,
       </if>
+      <if test="disabled != null">
+        disabled,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="week != null">
@@ -203,6 +207,9 @@
       <if test="createUid != null">
         #{createUid,jdbcType=INTEGER},
       </if>
+      <if test="disabled != null">
+        #{disabled,jdbcType=CHAR},
+      </if>
     </trim>
   </insert>
   <select id="countByExample" parameterType="com.koobietech.eas.mbg.model.EasEduScheduleExample" resultType="java.lang.Long">
@@ -253,6 +260,9 @@
       <if test="record.createUid != null">
         create_uid = #{record.createUid,jdbcType=INTEGER},
       </if>
+      <if test="record.disabled != null">
+        disabled = #{record.disabled,jdbcType=CHAR},
+      </if>
     </set>
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
@@ -272,7 +282,8 @@
       subjects_id = #{record.subjectsId,jdbcType=INTEGER},
       create_time = #{record.createTime,jdbcType=TIMESTAMP},
       modify_time = #{record.modifyTime,jdbcType=TIMESTAMP},
-      create_uid = #{record.createUid,jdbcType=INTEGER}
+      create_uid = #{record.createUid,jdbcType=INTEGER},
+      disabled = #{record.disabled,jdbcType=CHAR}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -316,6 +327,9 @@
       <if test="createUid != null">
         create_uid = #{createUid,jdbcType=INTEGER},
       </if>
+      <if test="disabled != null">
+        disabled = #{disabled,jdbcType=CHAR},
+      </if>
     </set>
     where id = #{id,jdbcType=BIGINT}
   </update>
@@ -332,7 +346,8 @@
       subjects_id = #{subjectsId,jdbcType=INTEGER},
       create_time = #{createTime,jdbcType=TIMESTAMP},
       modify_time = #{modifyTime,jdbcType=TIMESTAMP},
-      create_uid = #{createUid,jdbcType=INTEGER}
+      create_uid = #{createUid,jdbcType=INTEGER},
+      disabled = #{disabled,jdbcType=CHAR}
     where id = #{id,jdbcType=BIGINT}
   </update>
 </mapper>

mbg/src/main/resources/com/koobietech/eas/mbg/mapper/EasEduSubjectsMapper.xml

@@ -8,6 +8,7 @@
     <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
     <result column="modify_time" jdbcType="TIMESTAMP" property="modifyTime" />
     <result column="create_uid" jdbcType="INTEGER" property="createUid" />
+    <result column="disabled" jdbcType="CHAR" property="disabled" />
   </resultMap>
   <resultMap extends="BaseResultMap" id="ResultMapWithBLOBs" type="com.koobietech.eas.mbg.model.EasEduSubjects">
     <result column="description" jdbcType="LONGVARCHAR" property="description" />
@@ -71,7 +72,7 @@
     </where>
   </sql>
   <sql id="Base_Column_List">
-    id, name, category_id, create_time, modify_time, create_uid
+    id, name, category_id, create_time, modify_time, create_uid, disabled
   </sql>
   <sql id="Blob_Column_List">
     description
@@ -129,11 +130,11 @@
       SELECT LAST_INSERT_ID()
     </selectKey>
     insert into eas_edu_subjects (name, category_id, create_time, 
-      modify_time, create_uid, description
-      )
+      modify_time, create_uid, disabled, 
+      description)
     values (#{name,jdbcType=VARCHAR}, #{categoryId,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, 
-      #{modifyTime,jdbcType=TIMESTAMP}, #{createUid,jdbcType=INTEGER}, #{description,jdbcType=LONGVARCHAR}
-      )
+      #{modifyTime,jdbcType=TIMESTAMP}, #{createUid,jdbcType=INTEGER}, #{disabled,jdbcType=CHAR}, 
+      #{description,jdbcType=LONGVARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="com.koobietech.eas.mbg.model.EasEduSubjects">
     <selectKey keyProperty="id" order="AFTER" resultType="java.lang.Integer">
@@ -156,6 +157,9 @@
       <if test="createUid != null">
         create_uid,
       </if>
+      <if test="disabled != null">
+        disabled,
+      </if>
       <if test="description != null">
         description,
       </if>
@@ -176,6 +180,9 @@
       <if test="createUid != null">
         #{createUid,jdbcType=INTEGER},
       </if>
+      <if test="disabled != null">
+        #{disabled,jdbcType=CHAR},
+      </if>
       <if test="description != null">
         #{description,jdbcType=LONGVARCHAR},
       </if>
@@ -208,6 +215,9 @@
       <if test="record.createUid != null">
         create_uid = #{record.createUid,jdbcType=INTEGER},
       </if>
+      <if test="record.disabled != null">
+        disabled = #{record.disabled,jdbcType=CHAR},
+      </if>
       <if test="record.description != null">
         description = #{record.description,jdbcType=LONGVARCHAR},
       </if>
@@ -224,6 +234,7 @@
       create_time = #{record.createTime,jdbcType=TIMESTAMP},
       modify_time = #{record.modifyTime,jdbcType=TIMESTAMP},
       create_uid = #{record.createUid,jdbcType=INTEGER},
+      disabled = #{record.disabled,jdbcType=CHAR},
       description = #{record.description,jdbcType=LONGVARCHAR}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
@@ -236,7 +247,8 @@
       category_id = #{record.categoryId,jdbcType=VARCHAR},
       create_time = #{record.createTime,jdbcType=TIMESTAMP},
       modify_time = #{record.modifyTime,jdbcType=TIMESTAMP},
-      create_uid = #{record.createUid,jdbcType=INTEGER}
+      create_uid = #{record.createUid,jdbcType=INTEGER},
+      disabled = #{record.disabled,jdbcType=CHAR}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -259,6 +271,9 @@
       <if test="createUid != null">
         create_uid = #{createUid,jdbcType=INTEGER},
       </if>
+      <if test="disabled != null">
+        disabled = #{disabled,jdbcType=CHAR},
+      </if>
       <if test="description != null">
         description = #{description,jdbcType=LONGVARCHAR},
       </if>
@@ -272,6 +287,7 @@
       create_time = #{createTime,jdbcType=TIMESTAMP},
       modify_time = #{modifyTime,jdbcType=TIMESTAMP},
       create_uid = #{createUid,jdbcType=INTEGER},
+      disabled = #{disabled,jdbcType=CHAR},
       description = #{description,jdbcType=LONGVARCHAR}
     where id = #{id,jdbcType=INTEGER}
   </update>
@@ -281,7 +297,8 @@
       category_id = #{categoryId,jdbcType=VARCHAR},
       create_time = #{createTime,jdbcType=TIMESTAMP},
       modify_time = #{modifyTime,jdbcType=TIMESTAMP},
-      create_uid = #{createUid,jdbcType=INTEGER}
+      create_uid = #{createUid,jdbcType=INTEGER},
+      disabled = #{disabled,jdbcType=CHAR}
     where id = #{id,jdbcType=INTEGER}
   </update>
 </mapper>

mbg/src/main/resources/com/koobietech/eas/mbg/mapper/EasSysDepartmentMapper.xml

@@ -11,6 +11,7 @@
     <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
     <result column="modify_time" jdbcType="TIMESTAMP" property="modifyTime" />
     <result column="create_uid" jdbcType="INTEGER" property="createUid" />
+    <result column="disabled" jdbcType="CHAR" property="disabled" />
   </resultMap>
   <sql id="Example_Where_Clause">
     <where>
@@ -71,7 +72,8 @@
     </where>
   </sql>
   <sql id="Base_Column_List">
-    id, depname, address, phone, email, manager, create_time, modify_time, create_uid
+    id, depname, address, phone, email, manager, create_time, modify_time, create_uid, 
+    disabled
   </sql>
   <select id="selectByExample" parameterType="com.koobietech.eas.mbg.model.EasSysDepartmentExample" resultMap="BaseResultMap">
     select
@@ -109,10 +111,12 @@
     </selectKey>
     insert into eas_sys_department (depname, address, phone, 
       email, manager, create_time, 
-      modify_time, create_uid)
+      modify_time, create_uid, disabled
+      )
     values (#{depname,jdbcType=VARCHAR}, #{address,jdbcType=VARCHAR}, #{phone,jdbcType=VARCHAR}, 
       #{email,jdbcType=VARCHAR}, #{manager,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, 
-      #{modifyTime,jdbcType=TIMESTAMP}, #{createUid,jdbcType=INTEGER})
+      #{modifyTime,jdbcType=TIMESTAMP}, #{createUid,jdbcType=INTEGER}, #{disabled,jdbcType=CHAR}
+      )
   </insert>
   <insert id="insertSelective" parameterType="com.koobietech.eas.mbg.model.EasSysDepartment">
     <selectKey keyProperty="id" order="AFTER" resultType="java.lang.Long">
@@ -144,6 +148,9 @@
       <if test="createUid != null">
         create_uid,
       </if>
+      <if test="disabled != null">
+        disabled,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="depname != null">
@@ -170,6 +177,9 @@
       <if test="createUid != null">
         #{createUid,jdbcType=INTEGER},
       </if>
+      <if test="disabled != null">
+        #{disabled,jdbcType=CHAR},
+      </if>
     </trim>
   </insert>
   <select id="countByExample" parameterType="com.koobietech.eas.mbg.model.EasSysDepartmentExample" resultType="java.lang.Long">
@@ -208,6 +218,9 @@
       <if test="record.createUid != null">
         create_uid = #{record.createUid,jdbcType=INTEGER},
       </if>
+      <if test="record.disabled != null">
+        disabled = #{record.disabled,jdbcType=CHAR},
+      </if>
     </set>
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
@@ -223,7 +236,8 @@
       manager = #{record.manager,jdbcType=VARCHAR},
       create_time = #{record.createTime,jdbcType=TIMESTAMP},
       modify_time = #{record.modifyTime,jdbcType=TIMESTAMP},
-      create_uid = #{record.createUid,jdbcType=INTEGER}
+      create_uid = #{record.createUid,jdbcType=INTEGER},
+      disabled = #{record.disabled,jdbcType=CHAR}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -255,6 +269,9 @@
       <if test="createUid != null">
         create_uid = #{createUid,jdbcType=INTEGER},
       </if>
+      <if test="disabled != null">
+        disabled = #{disabled,jdbcType=CHAR},
+      </if>
     </set>
     where id = #{id,jdbcType=BIGINT}
   </update>
@@ -267,7 +284,8 @@
       manager = #{manager,jdbcType=VARCHAR},
       create_time = #{createTime,jdbcType=TIMESTAMP},
       modify_time = #{modifyTime,jdbcType=TIMESTAMP},
-      create_uid = #{createUid,jdbcType=INTEGER}
+      create_uid = #{createUid,jdbcType=INTEGER},
+      disabled = #{disabled,jdbcType=CHAR}
     where id = #{id,jdbcType=BIGINT}
   </update>
 </mapper>

mbg/src/main/resources/com/koobietech/eas/mbg/mapper/EasSysLogsMapper.xml

@@ -0,0 +1,266 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.koobietech.eas.mbg.mapper.EasSysLogsMapper">
+  <resultMap id="BaseResultMap" type="com.koobietech.eas.mbg.model.EasSysLogs">
+    <id column="id" jdbcType="INTEGER" property="id" />
+    <result column="timestamp" jdbcType="TIMESTAMP" property="timestamp" />
+    <result column="level" jdbcType="VARCHAR" property="level" />
+    <result column="logger" jdbcType="VARCHAR" property="logger" />
+  </resultMap>
+  <resultMap extends="BaseResultMap" id="ResultMapWithBLOBs" type="com.koobietech.eas.mbg.model.EasSysLogs">
+    <result column="message" jdbcType="LONGVARCHAR" property="message" />
+    <result column="exception" jdbcType="LONGVARCHAR" property="exception" />
+  </resultMap>
+  <sql id="Example_Where_Clause">
+    <where>
+      <foreach collection="oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Update_By_Example_Where_Clause">
+    <where>
+      <foreach collection="example.oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Base_Column_List">
+    id, timestamp, level, logger
+  </sql>
+  <sql id="Blob_Column_List">
+    message, exception
+  </sql>
+  <select id="selectByExampleWithBLOBs" parameterType="com.koobietech.eas.mbg.model.EasSysLogsExample" resultMap="ResultMapWithBLOBs">
+    select
+    <if test="distinct">
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    ,
+    <include refid="Blob_Column_List" />
+    from eas_sys_logs
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+    <if test="orderByClause != null">
+      order by ${orderByClause}
+    </if>
+  </select>
+  <select id="selectByExample" parameterType="com.koobietech.eas.mbg.model.EasSysLogsExample" resultMap="BaseResultMap">
+    select
+    <if test="distinct">
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    from eas_sys_logs
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+    <if test="orderByClause != null">
+      order by ${orderByClause}
+    </if>
+  </select>
+  <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="ResultMapWithBLOBs">
+    select 
+    <include refid="Base_Column_List" />
+    ,
+    <include refid="Blob_Column_List" />
+    from eas_sys_logs
+    where id = #{id,jdbcType=INTEGER}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
+    delete from eas_sys_logs
+    where id = #{id,jdbcType=INTEGER}
+  </delete>
+  <delete id="deleteByExample" parameterType="com.koobietech.eas.mbg.model.EasSysLogsExample">
+    delete from eas_sys_logs
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" parameterType="com.koobietech.eas.mbg.model.EasSysLogs">
+    <selectKey keyProperty="id" order="AFTER" resultType="java.lang.Integer">
+      SELECT LAST_INSERT_ID()
+    </selectKey>
+    insert into eas_sys_logs (timestamp, level, logger, 
+      message, exception)
+    values (#{timestamp,jdbcType=TIMESTAMP}, #{level,jdbcType=VARCHAR}, #{logger,jdbcType=VARCHAR}, 
+      #{message,jdbcType=LONGVARCHAR}, #{exception,jdbcType=LONGVARCHAR})
+  </insert>
+  <insert id="insertSelective" parameterType="com.koobietech.eas.mbg.model.EasSysLogs">
+    <selectKey keyProperty="id" order="AFTER" resultType="java.lang.Integer">
+      SELECT LAST_INSERT_ID()
+    </selectKey>
+    insert into eas_sys_logs
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="timestamp != null">
+        timestamp,
+      </if>
+      <if test="level != null">
+        level,
+      </if>
+      <if test="logger != null">
+        logger,
+      </if>
+      <if test="message != null">
+        message,
+      </if>
+      <if test="exception != null">
+        exception,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="timestamp != null">
+        #{timestamp,jdbcType=TIMESTAMP},
+      </if>
+      <if test="level != null">
+        #{level,jdbcType=VARCHAR},
+      </if>
+      <if test="logger != null">
+        #{logger,jdbcType=VARCHAR},
+      </if>
+      <if test="message != null">
+        #{message,jdbcType=LONGVARCHAR},
+      </if>
+      <if test="exception != null">
+        #{exception,jdbcType=LONGVARCHAR},
+      </if>
+    </trim>
+  </insert>
+  <select id="countByExample" parameterType="com.koobietech.eas.mbg.model.EasSysLogsExample" resultType="java.lang.Long">
+    select count(*) from eas_sys_logs
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </select>
+  <update id="updateByExampleSelective" parameterType="map">
+    update eas_sys_logs
+    <set>
+      <if test="record.id != null">
+        id = #{record.id,jdbcType=INTEGER},
+      </if>
+      <if test="record.timestamp != null">
+        timestamp = #{record.timestamp,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.level != null">
+        level = #{record.level,jdbcType=VARCHAR},
+      </if>
+      <if test="record.logger != null">
+        logger = #{record.logger,jdbcType=VARCHAR},
+      </if>
+      <if test="record.message != null">
+        message = #{record.message,jdbcType=LONGVARCHAR},
+      </if>
+      <if test="record.exception != null">
+        exception = #{record.exception,jdbcType=LONGVARCHAR},
+      </if>
+    </set>
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByExampleWithBLOBs" parameterType="map">
+    update eas_sys_logs
+    set id = #{record.id,jdbcType=INTEGER},
+      timestamp = #{record.timestamp,jdbcType=TIMESTAMP},
+      level = #{record.level,jdbcType=VARCHAR},
+      logger = #{record.logger,jdbcType=VARCHAR},
+      message = #{record.message,jdbcType=LONGVARCHAR},
+      exception = #{record.exception,jdbcType=LONGVARCHAR}
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByExample" parameterType="map">
+    update eas_sys_logs
+    set id = #{record.id,jdbcType=INTEGER},
+      timestamp = #{record.timestamp,jdbcType=TIMESTAMP},
+      level = #{record.level,jdbcType=VARCHAR},
+      logger = #{record.logger,jdbcType=VARCHAR}
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.koobietech.eas.mbg.model.EasSysLogs">
+    update eas_sys_logs
+    <set>
+      <if test="timestamp != null">
+        timestamp = #{timestamp,jdbcType=TIMESTAMP},
+      </if>
+      <if test="level != null">
+        level = #{level,jdbcType=VARCHAR},
+      </if>
+      <if test="logger != null">
+        logger = #{logger,jdbcType=VARCHAR},
+      </if>
+      <if test="message != null">
+        message = #{message,jdbcType=LONGVARCHAR},
+      </if>
+      <if test="exception != null">
+        exception = #{exception,jdbcType=LONGVARCHAR},
+      </if>
+    </set>
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+  <update id="updateByPrimaryKeyWithBLOBs" parameterType="com.koobietech.eas.mbg.model.EasSysLogs">
+    update eas_sys_logs
+    set timestamp = #{timestamp,jdbcType=TIMESTAMP},
+      level = #{level,jdbcType=VARCHAR},
+      logger = #{logger,jdbcType=VARCHAR},
+      message = #{message,jdbcType=LONGVARCHAR},
+      exception = #{exception,jdbcType=LONGVARCHAR}
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.koobietech.eas.mbg.model.EasSysLogs">
+    update eas_sys_logs
+    set timestamp = #{timestamp,jdbcType=TIMESTAMP},
+      level = #{level,jdbcType=VARCHAR},
+      logger = #{logger,jdbcType=VARCHAR}
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+</mapper>

mbg/src/main/resources/com/koobietech/eas/mbg/mapper/EasSysPermissionMapper.xml

@@ -8,6 +8,7 @@
     <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
     <result column="modify_time" jdbcType="TIMESTAMP" property="modifyTime" />
     <result column="create_uid" jdbcType="INTEGER" property="createUid" />
+    <result column="disabled" jdbcType="CHAR" property="disabled" />
   </resultMap>
   <resultMap extends="BaseResultMap" id="ResultMapWithBLOBs" type="com.koobietech.eas.mbg.model.EasSysPermission">
     <result column="description" jdbcType="LONGVARCHAR" property="description" />
@@ -71,7 +72,7 @@
     </where>
   </sql>
   <sql id="Base_Column_List">
-    id, name, is_active, create_time, modify_time, create_uid
+    id, name, is_active, create_time, modify_time, create_uid, disabled
   </sql>
   <sql id="Blob_Column_List">
     description
@@ -129,11 +130,11 @@
       SELECT LAST_INSERT_ID()
     </selectKey>
     insert into eas_sys_permission (name, is_active, create_time, 
-      modify_time, create_uid, description
-      )
+      modify_time, create_uid, disabled, 
+      description)
     values (#{name,jdbcType=VARCHAR}, #{isActive,jdbcType=TINYINT}, #{createTime,jdbcType=TIMESTAMP}, 
-      #{modifyTime,jdbcType=TIMESTAMP}, #{createUid,jdbcType=INTEGER}, #{description,jdbcType=LONGVARCHAR}
-      )
+      #{modifyTime,jdbcType=TIMESTAMP}, #{createUid,jdbcType=INTEGER}, #{disabled,jdbcType=CHAR}, 
+      #{description,jdbcType=LONGVARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="com.koobietech.eas.mbg.model.EasSysPermission">
     <selectKey keyProperty="id" order="AFTER" resultType="java.lang.Integer">
@@ -156,6 +157,9 @@
       <if test="createUid != null">
         create_uid,
       </if>
+      <if test="disabled != null">
+        disabled,
+      </if>
       <if test="description != null">
         description,
       </if>
@@ -176,6 +180,9 @@
       <if test="createUid != null">
         #{createUid,jdbcType=INTEGER},
       </if>
+      <if test="disabled != null">
+        #{disabled,jdbcType=CHAR},
+      </if>
       <if test="description != null">
         #{description,jdbcType=LONGVARCHAR},
       </if>
@@ -208,6 +215,9 @@
       <if test="record.createUid != null">
         create_uid = #{record.createUid,jdbcType=INTEGER},
       </if>
+      <if test="record.disabled != null">
+        disabled = #{record.disabled,jdbcType=CHAR},
+      </if>
       <if test="record.description != null">
         description = #{record.description,jdbcType=LONGVARCHAR},
       </if>
@@ -224,6 +234,7 @@
       create_time = #{record.createTime,jdbcType=TIMESTAMP},
       modify_time = #{record.modifyTime,jdbcType=TIMESTAMP},
       create_uid = #{record.createUid,jdbcType=INTEGER},
+      disabled = #{record.disabled,jdbcType=CHAR},
       description = #{record.description,jdbcType=LONGVARCHAR}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
@@ -236,7 +247,8 @@
       is_active = #{record.isActive,jdbcType=TINYINT},
       create_time = #{record.createTime,jdbcType=TIMESTAMP},
       modify_time = #{record.modifyTime,jdbcType=TIMESTAMP},
-      create_uid = #{record.createUid,jdbcType=INTEGER}
+      create_uid = #{record.createUid,jdbcType=INTEGER},
+      disabled = #{record.disabled,jdbcType=CHAR}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -259,6 +271,9 @@
       <if test="createUid != null">
         create_uid = #{createUid,jdbcType=INTEGER},
       </if>
+      <if test="disabled != null">
+        disabled = #{disabled,jdbcType=CHAR},
+      </if>
       <if test="description != null">
         description = #{description,jdbcType=LONGVARCHAR},
       </if>
@@ -272,6 +287,7 @@
       create_time = #{createTime,jdbcType=TIMESTAMP},
       modify_time = #{modifyTime,jdbcType=TIMESTAMP},
       create_uid = #{createUid,jdbcType=INTEGER},
+      disabled = #{disabled,jdbcType=CHAR},
       description = #{description,jdbcType=LONGVARCHAR}
     where id = #{id,jdbcType=INTEGER}
   </update>
@@ -281,7 +297,8 @@
       is_active = #{isActive,jdbcType=TINYINT},
       create_time = #{createTime,jdbcType=TIMESTAMP},
       modify_time = #{modifyTime,jdbcType=TIMESTAMP},
-      create_uid = #{createUid,jdbcType=INTEGER}
+      create_uid = #{createUid,jdbcType=INTEGER},
+      disabled = #{disabled,jdbcType=CHAR}
     where id = #{id,jdbcType=INTEGER}
   </update>
 </mapper>

mbg/src/main/resources/com/koobietech/eas/mbg/mapper/EasSysPesRelationMapper.xml

@@ -4,7 +4,7 @@
   <resultMap id="BaseResultMap" type="com.koobietech.eas.mbg.model.EasSysPesRelation">
     <id column="id" jdbcType="INTEGER" property="id" />
     <result column="permission_id" jdbcType="INTEGER" property="permissionId" />
-    <result column="dep_id" jdbcType="INTEGER" property="depId" />
+    <result column="department_id" jdbcType="INTEGER" property="departmentId" />
     <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
     <result column="create_uid" jdbcType="INTEGER" property="createUid" />
   </resultMap>
@@ -67,7 +67,7 @@
     </where>
   </sql>
   <sql id="Base_Column_List">
-    id, permission_id, dep_id, create_time, create_uid
+    id, permission_id, department_id, create_time, create_uid
   </sql>
   <select id="selectByExample" parameterType="com.koobietech.eas.mbg.model.EasSysPesRelationExample" resultMap="BaseResultMap">
     select
@@ -103,9 +103,9 @@
     <selectKey keyProperty="id" order="AFTER" resultType="java.lang.Integer">
       SELECT LAST_INSERT_ID()
     </selectKey>
-    insert into eas_sys_pes_relation (permission_id, dep_id, create_time, 
+    insert into eas_sys_pes_relation (permission_id, department_id, create_time, 
       create_uid)
-    values (#{permissionId,jdbcType=INTEGER}, #{depId,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}, 
+    values (#{permissionId,jdbcType=INTEGER}, #{departmentId,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}, 
       #{createUid,jdbcType=INTEGER})
   </insert>
   <insert id="insertSelective" parameterType="com.koobietech.eas.mbg.model.EasSysPesRelation">
@@ -117,8 +117,8 @@
       <if test="permissionId != null">
         permission_id,
       </if>
-      <if test="depId != null">
-        dep_id,
+      <if test="departmentId != null">
+        department_id,
       </if>
       <if test="createTime != null">
         create_time,
@@ -131,8 +131,8 @@
       <if test="permissionId != null">
         #{permissionId,jdbcType=INTEGER},
       </if>
-      <if test="depId != null">
-        #{depId,jdbcType=INTEGER},
+      <if test="departmentId != null">
+        #{departmentId,jdbcType=INTEGER},
       </if>
       <if test="createTime != null">
         #{createTime,jdbcType=TIMESTAMP},
@@ -157,8 +157,8 @@
       <if test="record.permissionId != null">
         permission_id = #{record.permissionId,jdbcType=INTEGER},
       </if>
-      <if test="record.depId != null">
-        dep_id = #{record.depId,jdbcType=INTEGER},
+      <if test="record.departmentId != null">
+        department_id = #{record.departmentId,jdbcType=INTEGER},
       </if>
       <if test="record.createTime != null">
         create_time = #{record.createTime,jdbcType=TIMESTAMP},
@@ -175,7 +175,7 @@
     update eas_sys_pes_relation
     set id = #{record.id,jdbcType=INTEGER},
       permission_id = #{record.permissionId,jdbcType=INTEGER},
-      dep_id = #{record.depId,jdbcType=INTEGER},
+      department_id = #{record.departmentId,jdbcType=INTEGER},
       create_time = #{record.createTime,jdbcType=TIMESTAMP},
       create_uid = #{record.createUid,jdbcType=INTEGER}
     <if test="_parameter != null">
@@ -188,8 +188,8 @@
       <if test="permissionId != null">
         permission_id = #{permissionId,jdbcType=INTEGER},
       </if>
-      <if test="depId != null">
-        dep_id = #{depId,jdbcType=INTEGER},
+      <if test="departmentId != null">
+        department_id = #{departmentId,jdbcType=INTEGER},
       </if>
       <if test="createTime != null">
         create_time = #{createTime,jdbcType=TIMESTAMP},
@@ -203,7 +203,7 @@
   <update id="updateByPrimaryKey" parameterType="com.koobietech.eas.mbg.model.EasSysPesRelation">
     update eas_sys_pes_relation
     set permission_id = #{permissionId,jdbcType=INTEGER},
-      dep_id = #{depId,jdbcType=INTEGER},
+      department_id = #{departmentId,jdbcType=INTEGER},
       create_time = #{createTime,jdbcType=TIMESTAMP},
       create_uid = #{createUid,jdbcType=INTEGER}
     where id = #{id,jdbcType=INTEGER}

mbg/src/main/resources/com/koobietech/eas/mbg/mapper/EasSysStudentMapper.xml

@@ -15,6 +15,7 @@
     <result column="admissions_id" jdbcType="INTEGER" property="admissionsId" />
     <result column="manager_id" jdbcType="INTEGER" property="managerId" />
     <result column="create_uid" jdbcType="INTEGER" property="createUid" />
+    <result column="disabled" jdbcType="CHAR" property="disabled" />
   </resultMap>
   <sql id="Example_Where_Clause">
     <where>
@@ -76,7 +77,7 @@
   </sql>
   <sql id="Base_Column_List">
     id, student_number, student_name, gender, phone, email, enrollment_date, passwd, 
-    create_time, modify_time, admissions_id, manager_id, create_uid
+    create_time, modify_time, admissions_id, manager_id, create_uid, disabled
   </sql>
   <select id="selectByExample" parameterType="com.koobietech.eas.mbg.model.EasSysStudentExample" resultMap="BaseResultMap">
     select
@@ -115,13 +116,13 @@
     insert into eas_sys_student (student_number, student_name, gender, 
       phone, email, enrollment_date, 
       passwd, create_time, modify_time, 
-      admissions_id, manager_id, create_uid
-      )
+      admissions_id, manager_id, create_uid, 
+      disabled)
     values (#{studentNumber,jdbcType=VARCHAR}, #{studentName,jdbcType=VARCHAR}, #{gender,jdbcType=CHAR}, 
       #{phone,jdbcType=VARCHAR}, #{email,jdbcType=VARCHAR}, #{enrollmentDate,jdbcType=DATE}, 
       #{passwd,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, #{modifyTime,jdbcType=TIMESTAMP}, 
-      #{admissionsId,jdbcType=INTEGER}, #{managerId,jdbcType=INTEGER}, #{createUid,jdbcType=INTEGER}
-      )
+      #{admissionsId,jdbcType=INTEGER}, #{managerId,jdbcType=INTEGER}, #{createUid,jdbcType=INTEGER}, 
+      #{disabled,jdbcType=CHAR})
   </insert>
   <insert id="insertSelective" parameterType="com.koobietech.eas.mbg.model.EasSysStudent">
     <selectKey keyProperty="id" order="AFTER" resultType="java.lang.Long">
@@ -165,6 +166,9 @@
       <if test="createUid != null">
         create_uid,
       </if>
+      <if test="disabled != null">
+        disabled,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="studentNumber != null">
@@ -203,6 +207,9 @@
       <if test="createUid != null">
         #{createUid,jdbcType=INTEGER},
       </if>
+      <if test="disabled != null">
+        #{disabled,jdbcType=CHAR},
+      </if>
     </trim>
   </insert>
   <select id="countByExample" parameterType="com.koobietech.eas.mbg.model.EasSysStudentExample" resultType="java.lang.Long">
@@ -253,6 +260,9 @@
       <if test="record.createUid != null">
         create_uid = #{record.createUid,jdbcType=INTEGER},
       </if>
+      <if test="record.disabled != null">
+        disabled = #{record.disabled,jdbcType=CHAR},
+      </if>
     </set>
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
@@ -272,7 +282,8 @@
       modify_time = #{record.modifyTime,jdbcType=TIMESTAMP},
       admissions_id = #{record.admissionsId,jdbcType=INTEGER},
       manager_id = #{record.managerId,jdbcType=INTEGER},
-      create_uid = #{record.createUid,jdbcType=INTEGER}
+      create_uid = #{record.createUid,jdbcType=INTEGER},
+      disabled = #{record.disabled,jdbcType=CHAR}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -316,6 +327,9 @@
       <if test="createUid != null">
         create_uid = #{createUid,jdbcType=INTEGER},
       </if>
+      <if test="disabled != null">
+        disabled = #{disabled,jdbcType=CHAR},
+      </if>
     </set>
     where id = #{id,jdbcType=BIGINT}
   </update>
@@ -332,7 +346,8 @@
       modify_time = #{modifyTime,jdbcType=TIMESTAMP},
       admissions_id = #{admissionsId,jdbcType=INTEGER},
       manager_id = #{managerId,jdbcType=INTEGER},
-      create_uid = #{createUid,jdbcType=INTEGER}
+      create_uid = #{createUid,jdbcType=INTEGER},
+      disabled = #{disabled,jdbcType=CHAR}
     where id = #{id,jdbcType=BIGINT}
   </update>
 </mapper>

mbg/src/main/resources/com/koobietech/eas/mbg/mapper/EasSysUserinfoMapper.xml

@@ -12,6 +12,7 @@
     <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
     <result column="modify_time" jdbcType="TIMESTAMP" property="modifyTime" />
     <result column="create_uid" jdbcType="INTEGER" property="createUid" />
+    <result column="disabled" jdbcType="CHAR" property="disabled" />
   </resultMap>
   <sql id="Example_Where_Clause">
     <where>
@@ -72,7 +73,8 @@
     </where>
   </sql>
   <sql id="Base_Column_List">
-    id, username, passwd, email, relname, phone, address, create_time, modify_time, create_uid
+    id, username, passwd, email, relname, phone, address, create_time, modify_time, create_uid, 
+    disabled
   </sql>
   <select id="selectByExample" parameterType="com.koobietech.eas.mbg.model.EasSysUserinfoExample" resultMap="BaseResultMap">
     select
@@ -110,12 +112,12 @@
     </selectKey>
     insert into eas_sys_userinfo (username, passwd, email, 
       relname, phone, address, 
-      create_time, modify_time, create_uid
-      )
+      create_time, modify_time, create_uid, 
+      disabled)
     values (#{username,jdbcType=VARCHAR}, #{passwd,jdbcType=VARCHAR}, #{email,jdbcType=VARCHAR}, 
       #{relname,jdbcType=VARCHAR}, #{phone,jdbcType=VARCHAR}, #{address,jdbcType=VARCHAR}, 
-      #{createTime,jdbcType=TIMESTAMP}, #{modifyTime,jdbcType=TIMESTAMP}, #{createUid,jdbcType=INTEGER}
-      )
+      #{createTime,jdbcType=TIMESTAMP}, #{modifyTime,jdbcType=TIMESTAMP}, #{createUid,jdbcType=INTEGER}, 
+      #{disabled,jdbcType=CHAR})
   </insert>
   <insert id="insertSelective" parameterType="com.koobietech.eas.mbg.model.EasSysUserinfo">
     <selectKey keyProperty="id" order="AFTER" resultType="java.lang.Long">
@@ -150,6 +152,9 @@
       <if test="createUid != null">
         create_uid,
       </if>
+      <if test="disabled != null">
+        disabled,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="username != null">
@@ -179,6 +184,9 @@
       <if test="createUid != null">
         #{createUid,jdbcType=INTEGER},
       </if>
+      <if test="disabled != null">
+        #{disabled,jdbcType=CHAR},
+      </if>
     </trim>
   </insert>
   <select id="countByExample" parameterType="com.koobietech.eas.mbg.model.EasSysUserinfoExample" resultType="java.lang.Long">
@@ -220,6 +228,9 @@
       <if test="record.createUid != null">
         create_uid = #{record.createUid,jdbcType=INTEGER},
       </if>
+      <if test="record.disabled != null">
+        disabled = #{record.disabled,jdbcType=CHAR},
+      </if>
     </set>
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
@@ -236,7 +247,8 @@
       address = #{record.address,jdbcType=VARCHAR},
       create_time = #{record.createTime,jdbcType=TIMESTAMP},
       modify_time = #{record.modifyTime,jdbcType=TIMESTAMP},
-      create_uid = #{record.createUid,jdbcType=INTEGER}
+      create_uid = #{record.createUid,jdbcType=INTEGER},
+      disabled = #{record.disabled,jdbcType=CHAR}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -271,6 +283,9 @@
       <if test="createUid != null">
         create_uid = #{createUid,jdbcType=INTEGER},
       </if>
+      <if test="disabled != null">
+        disabled = #{disabled,jdbcType=CHAR},
+      </if>
     </set>
     where id = #{id,jdbcType=BIGINT}
   </update>
@@ -284,7 +299,8 @@
       address = #{address,jdbcType=VARCHAR},
       create_time = #{createTime,jdbcType=TIMESTAMP},
       modify_time = #{modifyTime,jdbcType=TIMESTAMP},
-      create_uid = #{createUid,jdbcType=INTEGER}
+      create_uid = #{createUid,jdbcType=INTEGER},
+      disabled = #{disabled,jdbcType=CHAR}
     where id = #{id,jdbcType=BIGINT}
   </update>
 </mapper>

pom.xml

@@ -21,7 +21,6 @@
         <mybatis.version>2.2.0</mybatis.version>
         <mybatis-genertator.version>1.4.0</mybatis-genertator.version>
         <mysql-connector-j.version>8.0.32</mysql-connector-j.version>
-        <springfox-swagger2.version>2.6.1</springfox-swagger2.version>
         <slf4j-api.version>1.7.32</slf4j-api.version>
         <logback-classic.version>1.2.10</logback-classic.version>
         <fastjson2.version>2.0.31</fastjson2.version>
@@ -31,14 +30,22 @@
         <spring-context.version>5.3.24</spring-context.version>
         <spring-beans.version>5.3.24</spring-beans.version>
         <javax.servlet-api.version>4.0.1</javax.servlet-api.version>
-        <spring-data-redis>2.7.3</spring-data-redis>
+        <spring-data-redis.version>2.7.3</spring-data-redis.version>
+        <knife4j.version>4.1.0</knife4j.version>
     </properties>
     <dependencyManagement>
         <dependencies>
+            <dependency>
+                <groupId>com.github.xiaoymin</groupId>
+                <artifactId>knife4j-dependencies</artifactId>
+                <version>${knife4j.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
             <dependency>
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-starter-data-redis</artifactId>
-                <version>${spring-data-redis}</version>
+                <version>${spring-data-redis.version}</version>
             </dependency>
             <dependency>
                 <groupId>com.auth0</groupId>
@@ -106,4 +113,18 @@
         <module>upload</module>
     </modules>
 
+    <repositories>
+        <repository>
+            <id>aliyun</id>
+            <name>aliyun</name>
+            <url>https://maven.aliyun.com/repository/public</url>
+            <releases>
+                <enabled>true</enabled>
+            </releases>
+            <snapshots>
+                <enabled>false</enabled>
+            </snapshots>
+        </repository>
+    </repositories>
+
 </project>

service/pom.xml

@@ -16,6 +16,18 @@
             <groupId>org.springframework</groupId>
             <artifactId>spring-context</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.koobietech.eas</groupId>
+            <artifactId>dao</artifactId>
+            <version>0.0.1-SNAPSHOT</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.koobietech.eas</groupId>
+            <artifactId>mbg</artifactId>
+            <version>0.0.1-SNAPSHOT</version>
+            <scope>compile</scope>
+        </dependency>
     </dependencies>
 
     <parent>

service/src/main/java/com/koobietech/eas/service/DemoService.java

@@ -1,5 +1,10 @@
 package com.koobietech.eas.service;
 
+import com.koobietech.eas.dao.dto.TestDto;
+import com.koobietech.eas.mbg.model.EasSysStudent;
+
+import java.util.List;
+
 public interface DemoService {
-    String test();
+    List<EasSysStudent> test(TestDto dto);
 }

service/src/main/java/com/koobietech/eas/service/impl/DemoServiceImpl.java

@@ -1,12 +1,35 @@
 package com.koobietech.eas.service.impl;
 
+import com.koobietech.eas.dao.dto.TestDto;
+import com.koobietech.eas.mbg.mapper.EasSysStudentMapper;
+import com.koobietech.eas.mbg.model.EasSysStudent;
+import com.koobietech.eas.mbg.model.EasSysStudentExample;
 import com.koobietech.eas.service.DemoService;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.util.StringUtils;
+
+import javax.annotation.Resource;
+import java.util.List;
+import java.util.Objects;
 
 @Service
 public class DemoServiceImpl implements DemoService {
+
+    @Resource
+    EasSysStudentMapper easSysStudentMapper;
+
     @Override
-    public String test() {
-        return "hello";
+    public List<EasSysStudent> test(TestDto dto) {
+        EasSysStudentExample easSysStudentExample = new EasSysStudentExample();
+        EasSysStudentExample.Criteria criteria = easSysStudentExample.createCriteria();
+        if (Objects.nonNull(dto.getId())) {
+            criteria.andIdEqualTo( Long.valueOf(dto.getId()) );
+        }
+        if (StringUtils.hasText(dto.getName())) {
+            criteria.andStudentNameLike( "%" + dto.getName() + "%" );
+        }
+        List<EasSysStudent> easSysStudents = easSysStudentMapper.selectByExample(easSysStudentExample);
+        return easSysStudents;
     }
 }