修改返回值。删除无用引用

amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/common/bo/ReginParams.java

 package com.yeejoin.amos.boot.biz.common.bo;
 
-import java.io.Serializable;
-
 import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
 
+import java.io.Serializable;
+
 /***
  *
  * 用户选择保存实体类

amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/common/controller/BaseController.java

@@ -7,7 +7,6 @@ import com.yeejoin.amos.component.feign.config.InnerInvokException;
 import com.yeejoin.amos.component.feign.model.FeignClientResult;
 import com.yeejoin.amos.feign.privilege.Privilege;
 import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
-
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.TransactionSystemException;
 import org.springframework.web.bind.annotation.RequestMapping;

amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/common/dto/BaseDto.java

 package com.yeejoin.amos.boot.biz.common.dto;
 
-import java.io.Serializable;
-import java.util.Date;
-
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
 /**
  * 基础DTO
  * @author kinky

amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/common/entity/BaseEntity.java

 package com.yeejoin.amos.boot.biz.common.entity;
 
-import java.io.Serializable;
-import java.util.Date;
-
 import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
-
 import lombok.Data;
 
+import java.io.Serializable;
+import java.util.Date;
+
 /**
  * 公共实体类
  *

amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/common/utils/CommonResponseUtil.java

 package com.yeejoin.amos.boot.biz.common.utils;
 
+import com.yeejoin.amos.boot.biz.common.constants.CommonConstant;
 import org.springframework.http.HttpStatus;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
 
-import com.yeejoin.amos.boot.biz.common.constants.CommonConstant;
-
 /**
  * @author DELL
  */

amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/common/utils/MyBatisPlusCodeGenerator.java

@@ -5,13 +5,7 @@ import com.baomidou.mybatisplus.core.exceptions.MybatisPlusException;
 import com.baomidou.mybatisplus.core.toolkit.StringPool;
 import com.baomidou.mybatisplus.generator.AutoGenerator;
 import com.baomidou.mybatisplus.generator.InjectionConfig;
-import com.baomidou.mybatisplus.generator.config.DataSourceConfig;
-import com.baomidou.mybatisplus.generator.config.FileOutConfig;
-import com.baomidou.mybatisplus.generator.config.GlobalConfig;
-import com.baomidou.mybatisplus.generator.config.ITypeConvert;
-import com.baomidou.mybatisplus.generator.config.PackageConfig;
-import com.baomidou.mybatisplus.generator.config.StrategyConfig;
-import com.baomidou.mybatisplus.generator.config.TemplateConfig;
+import com.baomidou.mybatisplus.generator.config.*;
 import com.baomidou.mybatisplus.generator.config.converts.MySqlTypeConvert;
 import com.baomidou.mybatisplus.generator.config.po.TableInfo;
 import com.baomidou.mybatisplus.generator.config.rules.DbColumnType;

amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/config/MyBatisPlusConfig.java

 package com.yeejoin.amos.boot.biz.config;
 
+import com.baomidou.mybatisplus.core.config.GlobalConfig;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import com.baomidou.mybatisplus.core.config.GlobalConfig;
 /**
  * 
  * 

amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/config/RedisConfig.java

@@ -9,7 +9,6 @@ import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.data.redis.connection.RedisConnectionFactory;
-import org.springframework.data.redis.connection.lettuce.LettuceConnectionFactory;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.data.redis.serializer.Jackson2JsonRedisSerializer;
 import org.springframework.data.redis.serializer.StringRedisSerializer;

amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/config/Swagger2Config.java

 package com.yeejoin.amos.boot.biz.config;
 
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
+import io.swagger.annotations.ApiOperation;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Import;
 import org.springframework.web.bind.annotation.RestController;
-import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
-import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
-
-import com.github.xiaoymin.knife4j.spring.annotations.EnableKnife4j;
-import com.yeejoin.amos.boot.biz.common.constants.CommonConstant;
-
-import io.swagger.annotations.ApiOperation;
-import springfox.bean.validators.configuration.BeanValidatorPluginsConfiguration;
 import springfox.documentation.builders.ApiInfoBuilder;
-import springfox.documentation.builders.ParameterBuilder;
 import springfox.documentation.builders.PathSelectors;
 import springfox.documentation.builders.RequestHandlerSelectors;
-import springfox.documentation.schema.ModelRef;
 import springfox.documentation.service.ApiInfo;
-import springfox.documentation.service.ApiKey;
-import springfox.documentation.service.AuthorizationScope;
-import springfox.documentation.service.Parameter;
-import springfox.documentation.service.SecurityReference;
-import springfox.documentation.service.SecurityScheme;
 import springfox.documentation.spi.DocumentationType;
-import springfox.documentation.spi.service.contexts.SecurityContext;
 import springfox.documentation.spring.web.plugins.Docket;
 import springfox.documentation.swagger2.annotations.EnableSwagger2WebMvc;
 /**

amos-boot-module/amos-boot-cloud-gateway/src/main/java/com/yeejoin/amos/server/gateway/config/CorsResponseHeaderFilter.java

 package com.yeejoin.amos.server.gateway.config;
 
-import java.util.ArrayList;
-
 import org.springframework.cloud.gateway.filter.GatewayFilterChain;
 import org.springframework.cloud.gateway.filter.GlobalFilter;
 import org.springframework.cloud.gateway.filter.NettyWriteResponseFilter;
 import org.springframework.core.Ordered;
 import org.springframework.http.HttpHeaders;
 import org.springframework.web.server.ServerWebExchange;
-
 import reactor.core.publisher.Mono;
 
+import java.util.ArrayList;
+
 public class CorsResponseHeaderFilter implements GlobalFilter, Ordered{
 	
 	@Override

amos-boot-module/amos-boot-cloud-gateway/src/main/java/com/yeejoin/amos/server/gateway/config/GatewayInfo.java

 package com.yeejoin.amos.server.gateway.config;
 
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.cloud.gateway.filter.GatewayFilter;
 import org.springframework.cloud.gateway.filter.factory.StripPrefixGatewayFilterFactory;
 import org.springframework.cloud.gateway.route.RouteLocator;

amos-boot-module/amos-boot-cloud-gateway/src/main/java/com/yeejoin/amos/server/gateway/face/service/DynamicRouteServiceImpl.java

@@ -7,7 +7,6 @@ import org.springframework.cloud.gateway.route.RouteDefinitionWriter;
 import org.springframework.context.ApplicationEventPublisher;
 import org.springframework.context.ApplicationEventPublisherAware;
 import org.springframework.stereotype.Service;
-
 import reactor.core.publisher.Mono;
 
 /**

amos-boot-module/amos-boot-module-api/amos-boot-module-demo-api/src/main/java/com/yeejoin/amos/boot/module/demo/api/dto/DemoDto.java

 package com.yeejoin.amos.boot.module.demo.api.dto;
 
-import com.baomidou.mybatisplus.annotation.TableName;
-import org.typroject.tyboot.core.rdbms.orm.entity.BaseEntity;
 import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import org.typroject.tyboot.core.rdbms.orm.entity.BaseEntity;
 /**
 * 
 *

amos-boot-module/amos-boot-module-api/amos-boot-module-demo-api/src/main/java/com/yeejoin/amos/boot/module/demo/api/entity/Demo.java

 package com.yeejoin.amos.boot.module.demo.api.entity;
 
-import com.baomidou.mybatisplus.annotation.TableName;
-import org.typroject.tyboot.core.rdbms.orm.entity.BaseEntity;
 import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import org.typroject.tyboot.core.rdbms.orm.entity.BaseEntity;
 /**
 * 
 *

amos-boot-module/amos-boot-module-api/amos-boot-module-demo-api/src/main/java/com/yeejoin/amos/boot/module/demo/api/mapper/DemoMapper.java

 package com.yeejoin.amos.boot.module.demo.api.mapper;
 
-import com.yeejoin.amos.boot.module.demo.api.entity.Demo;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yeejoin.amos.boot.module.demo.api.entity.Demo;
 
 /**
 *  Mapper 接口

amos-boot-module/amos-boot-module-api/amos-boot-module-demo-api/src/main/java/com/yeejoin/amos/boot/module/demo/api/service/IDemoService.java

 package com.yeejoin.amos.boot.module.demo.api.service;
 
-import com.yeejoin.amos.boot.module.demo.api.entity.Demo;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.yeejoin.amos.boot.module.demo.api.entity.Demo;
 
 /**
 *  服务类

amos-boot-module/amos-boot-module-api/amos-boot-module-demo-api/src/main/java/com/yeejoin/amos/boot/module/demo/api/vo/DemoVo.java

 package com.yeejoin.amos.boot.module.demo.api.vo;
 
-import com.baomidou.mybatisplus.annotation.TableName;
-import org.typroject.tyboot.core.rdbms.orm.entity.BaseEntity;
 import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 /**
 * 
 *

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/dto/AlertCalledDto.java

 package com.yeejoin.amos.boot.module.jcs.api.dto;
 
-import java.util.Date;
-
 import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
-
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+
+import java.util.Date;
 /**
 * 警情接警记录
 *

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/dto/AlertFromDto.java

 package com.yeejoin.amos.boot.module.jcs.api.dto;
 
 import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
-
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/dto/AlertFromTypeDto.java

 package com.yeejoin.amos.boot.module.jcs.api.dto;
 
 import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
-
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/dto/AlertFromValueDto.java

 package com.yeejoin.amos.boot.module.jcs.api.dto;
 
 import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
-
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/dto/AlertSubmittedDto.java

 package com.yeejoin.amos.boot.module.jcs.api.dto;
 
-import java.util.List;
-
 import com.alibaba.fastjson.JSONObject;
 import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
-
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import lombok.experimental.Accessors;
+
+import java.util.List;
 
 /**
 * 警情报送记录

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/dto/AlertSubmittedObjectDto.java

 package com.yeejoin.amos.boot.module.jcs.api.dto;
 
 import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
-
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/dto/DataDictionaryDto.java

 package com.yeejoin.amos.boot.module.jcs.api.dto;
 
 import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
-
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/dto/FireExpertsDto.java

 package com.yeejoin.amos.boot.module.jcs.api.dto;
 
-import java.util.Date;
-
 import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
-
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+
+import java.util.Date;
 /**
 * 
 *

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/dto/FireTeamDto.java

 package com.yeejoin.amos.boot.module.jcs.api.dto;
 
-import java.util.Date;
-
 import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
-
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+
+import java.util.Date;
 /**
 * 消防队伍
 *

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/dto/FirefightersContactsDto.java

 package com.yeejoin.amos.boot.module.jcs.api.dto;
 
-import java.util.Date;
-
 import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
-
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+
+import java.util.Date;
 /**
 * l联系人
 *

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/dto/FirefightersContractDto.java

 package com.yeejoin.amos.boot.module.jcs.api.dto;
 
-import java.util.Date;
-
 import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
-
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+
+import java.util.Date;
 /**
 * 消防员合同
 *

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/dto/FirefightersDto.java

 package com.yeejoin.amos.boot.module.jcs.api.dto;
 
-import java.util.Date;
-
 import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
-
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+
+import java.util.Date;
 /**
 * 消防队员
 *

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/dto/FirefightersEducationDto.java

 package com.yeejoin.amos.boot.module.jcs.api.dto;
 
-import java.util.Date;
-
 import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
-
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+
+import java.util.Date;
 /**
 * 人员学历
 *

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/dto/FirefightersJacketDto.java

 package com.yeejoin.amos.boot.module.jcs.api.dto;
 
-import java.util.Date;
-
 import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
-
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+
+import java.util.Date;
 /**
 * 消防人员配装记录
 *

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/dto/FirefightersPostDto.java

 package com.yeejoin.amos.boot.module.jcs.api.dto;
 
-import java.util.Date;
-
 import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
-
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+
+import java.util.Date;
 /**
 * 岗位信息
 *

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/dto/FirefightersThoughtDto.java

 package com.yeejoin.amos.boot.module.jcs.api.dto;
 
-import java.util.Date;
-
 import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
-
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+
+import java.util.Date;
 /**
 * 消防员思想谈话记录
 *

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/dto/FirefightersWorkexperienceDto.java

 package com.yeejoin.amos.boot.module.jcs.api.dto;
 
-import java.util.Date;
-
 import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
-
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+
+import java.util.Date;
 /**
 * 工作经历
 *

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/dto/OrgDepartmentDto.java

@@ -4,7 +4,6 @@ import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.yeejoin.amos.boot.biz.common.constants.CommonConstant;
 import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
-
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/dto/OrgPersonDto.java

@@ -4,7 +4,6 @@ import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.yeejoin.amos.boot.biz.common.constants.CommonConstant;
 import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
-
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/dto/OrgUsrAuthDto.java

 package com.yeejoin.amos.boot.module.jcs.api.dto;
 
 import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
-
 import io.swagger.annotations.ApiModel;
 import lombok.Data;
 /**

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/dto/OrgUsrDto.java

@@ -3,7 +3,6 @@ package com.yeejoin.amos.boot.module.jcs.api.dto;
 import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
-
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/dto/PowerTransferCompanyDto.java

 package com.yeejoin.amos.boot.module.jcs.api.dto;
 
-import java.util.List;
-
 import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
-
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 /**
 * 调派单位
 *

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/dto/PowerTransferCompanyResourcesDto.java

 package com.yeejoin.amos.boot.module.jcs.api.dto;
 
 import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
-
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/dto/PowerTransferDto.java

 package com.yeejoin.amos.boot.module.jcs.api.dto;
 
-import java.util.List;
-
 import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
-
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 /**
 * 力量调派
 *

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/dto/SubmitTargetCompanyDto.java

 package com.yeejoin.amos.boot.module.jcs.api.dto;
 
+import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
 import lombok.Data;
 
 import java.util.List;
 
-import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
-
 /**
  * 警情报送公司对象dto
  * @author DELL

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/dto/SubmitTargetPersonDto.java

 package com.yeejoin.amos.boot.module.jcs.api.dto;
 
 import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
-
 import lombok.Data;
 
 /**

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/dto/TemplateDto.java

 package com.yeejoin.amos.boot.module.jcs.api.dto;
 
 import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
-
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/entity/AlertCalled.java

 package com.yeejoin.amos.boot.module.jcs.api.entity;
 
-import com.baomidou.mybatisplus.annotation.*;
-
-import java.util.Date;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
 import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+
+import java.util.Date;
 /**
 * 警情接警记录
 *

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/entity/AlertForm.java

 package com.yeejoin.amos.boot.module.jcs.api.entity;
 
-import com.baomidou.mybatisplus.annotation.*;
+import com.baomidou.mybatisplus.annotation.TableName;
 import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 /**
 * 警情表单
 *

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/entity/AlertFormType.java

@@ -7,11 +7,6 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 /**
 * 动态表单类型
 *

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/entity/AlertFormValue.java

@@ -7,11 +7,6 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 /**
 * 
 *

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/entity/AlertSubmitted.java

 package com.yeejoin.amos.boot.module.jcs.api.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-import java.util.Date;
 import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+
+import java.util.Date;
 /**
 * 警情报送记录
 *

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/entity/AlertSubmittedObject.java

@@ -7,11 +7,6 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 /**
 * 报送对象
 *

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/entity/DataDictionary.java

@@ -7,11 +7,6 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 /**
 * 数据字典
 *

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/entity/ESAlertCalled.java

 package com.yeejoin.amos.boot.module.jcs.api.entity;
 
-import java.util.Date;
-
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.experimental.Accessors;
 import org.springframework.data.annotation.Id;
 import org.springframework.data.elasticsearch.annotations.DateFormat;
 import org.springframework.data.elasticsearch.annotations.Document;
 import org.springframework.data.elasticsearch.annotations.Field;
 import org.springframework.data.elasticsearch.annotations.FieldType;
 
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.experimental.Accessors;
+import java.util.Date;
 
 /**
  * 

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/entity/FireExperts.java

 package com.yeejoin.amos.boot.module.jcs.api.entity;
 
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
-import java.util.Date;
 import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -9,13 +10,7 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
-import com.baomidou.mybatisplus.annotation.FieldFill;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import java.util.Date;
 /**
 * 
 *

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/entity/FireTeam.java

 package com.yeejoin.amos.boot.module.jcs.api.entity;
 
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
-import java.util.Date;
 import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -9,13 +10,7 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
-import com.baomidou.mybatisplus.annotation.FieldFill;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import java.util.Date;
 /**
 * 消防队伍
 *

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/entity/Firefighters.java

 package com.yeejoin.amos.boot.module.jcs.api.entity;
 
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
-import java.util.Date;
 import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -9,13 +10,7 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
-import com.baomidou.mybatisplus.annotation.FieldFill;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import java.util.Date;
 /**
 * 消防队员
 *

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/entity/FirefightersContacts.java

 package com.yeejoin.amos.boot.module.jcs.api.entity;
 
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
-import java.util.Date;
 import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -9,13 +10,7 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
-import com.baomidou.mybatisplus.annotation.FieldFill;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import java.util.Date;
 /**
 * l联系人
 *

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/entity/FirefightersContract.java

 package com.yeejoin.amos.boot.module.jcs.api.entity;
 
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
-import java.util.Date;
-
-import org.springframework.format.annotation.DateTimeFormat;
-
 import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
 
-import com.baomidou.mybatisplus.annotation.FieldFill;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import java.util.Date;
 /**
 * 消防员合同
 *

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/entity/FirefightersEducation.java

 package com.yeejoin.amos.boot.module.jcs.api.entity;
 
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
-import java.util.Date;
 import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -9,13 +10,7 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
-import com.baomidou.mybatisplus.annotation.FieldFill;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import java.util.Date;
 /**
 * 人员学历
 *

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/entity/FirefightersJacket.java

 package com.yeejoin.amos.boot.module.jcs.api.entity;
 
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
-import java.util.Date;
-
-import org.springframework.format.annotation.DateTimeFormat;
-
 import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
 
-import com.baomidou.mybatisplus.annotation.FieldFill;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import java.util.Date;
 /**
 * 消防人员配装记录
 *

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/entity/FirefightersPost.java

 package com.yeejoin.amos.boot.module.jcs.api.entity;
 
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
-import java.util.Date;
 import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -9,13 +10,7 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
-import com.baomidou.mybatisplus.annotation.FieldFill;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import java.util.Date;
 /**
 * 岗位信息
 *

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/entity/FirefightersThought.java

 package com.yeejoin.amos.boot.module.jcs.api.entity;
 
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
-import java.util.Date;
-
-import org.springframework.format.annotation.DateTimeFormat;
-
 import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
 
-import com.baomidou.mybatisplus.annotation.FieldFill;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import java.util.Date;
 /**
 * 消防员思想谈话记录
 *

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/entity/FirefightersWorkexperience.java

 package com.yeejoin.amos.boot.module.jcs.api.entity;
 
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
-import java.util.Date;
 import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -9,13 +10,7 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
-import com.baomidou.mybatisplus.annotation.FieldFill;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import java.util.Date;
 /**
 * 工作经历
 *

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/entity/OrgUsr.java

@@ -3,7 +3,6 @@ package com.yeejoin.amos.boot.module.jcs.api.entity;
 import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.yeejoin.amos.boot.biz.common.constants.CommonConstant;
 import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/entity/OrgUsrAuth.java

@@ -3,15 +3,9 @@ package com.yeejoin.amos.boot.module.jcs.api.entity;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
 import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 /**
 * 
 *

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/entity/PowerTransferCompany.java

 package com.yeejoin.amos.boot.module.jcs.api.entity;
 
-import com.baomidou.mybatisplus.annotation.*;
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
 import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
-import com.baomidou.mybatisplus.annotation.TableName;
 /**
 * 调派单位
 *

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/entity/PowerTransferCompanyResources.java

 package com.yeejoin.amos.boot.module.jcs.api.entity;
 
-import com.baomidou.mybatisplus.annotation.*;
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
 import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
-import com.baomidou.mybatisplus.annotation.TableName;
 /**
 * 调派单位资源
 *

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/entity/Template.java

@@ -7,11 +7,6 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 /**
 * 模板表
 *

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/mapper/AlertCalledMapper.java

 package com.yeejoin.amos.boot.module.jcs.api.mapper;
 
-import com.yeejoin.amos.boot.module.jcs.api.entity.AlertCalled;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yeejoin.amos.boot.module.jcs.api.entity.AlertCalled;
 
 /**
 * 警情接警记录 Mapper 接口

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/mapper/AlertFormMapper.java

 package com.yeejoin.amos.boot.module.jcs.api.mapper;
 
-import com.yeejoin.amos.boot.module.jcs.api.entity.AlertForm;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yeejoin.amos.boot.module.jcs.api.entity.AlertForm;
 
 /**
 * 警情表单 Mapper 接口

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/mapper/AlertFormValueMapper.java

 package com.yeejoin.amos.boot.module.jcs.api.mapper;
 
-import com.yeejoin.amos.boot.module.jcs.api.entity.AlertFormValue;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yeejoin.amos.boot.module.jcs.api.entity.AlertFormValue;
 
 /**
 *  Mapper 接口

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/mapper/AlertSubmittedObjectMapper.java

 package com.yeejoin.amos.boot.module.jcs.api.mapper;
 
-import com.yeejoin.amos.boot.module.jcs.api.entity.AlertSubmittedObject;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yeejoin.amos.boot.module.jcs.api.entity.AlertSubmittedObject;
 
 /**
 * 报送对象 Mapper 接口

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/mapper/DataDictionaryMapper.java

 package com.yeejoin.amos.boot.module.jcs.api.mapper;
 
-import com.yeejoin.amos.boot.module.jcs.api.entity.DataDictionary;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yeejoin.amos.boot.module.jcs.api.entity.DataDictionary;
 
 /**
 * 数据字典 Mapper 接口

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/mapper/FireExpertsMapper.java

 package com.yeejoin.amos.boot.module.jcs.api.mapper;
 
-import com.yeejoin.amos.boot.module.jcs.api.entity.FireExperts;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yeejoin.amos.boot.module.jcs.api.entity.FireExperts;
 
 /**
 *  Mapper 接口

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/mapper/FireTeamMapper.java

 package com.yeejoin.amos.boot.module.jcs.api.mapper;
 
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.yeejoin.amos.boot.module.jcs.api.entity.FireTeam;
 import com.yeejoin.amos.boot.module.jcs.api.vo.FireTeamListVo;
 import com.yeejoin.amos.boot.module.jcs.api.vo.FireTeamVo;
+import org.apache.ibatis.annotations.Select;
 
 import java.util.List;
 import java.util.Map;
 
-import org.apache.ibatis.annotations.Select;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
 /**
 * 消防队伍 Mapper 接口
 *

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/mapper/FirefightersContactsMapper.java

 package com.yeejoin.amos.boot.module.jcs.api.mapper;
 
-import com.yeejoin.amos.boot.module.jcs.api.entity.FirefightersContacts;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yeejoin.amos.boot.module.jcs.api.entity.FirefightersContacts;
 
 /**
 * l联系人 Mapper 接口

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/mapper/FirefightersContractMapper.java

 package com.yeejoin.amos.boot.module.jcs.api.mapper;
 
-import com.yeejoin.amos.boot.module.jcs.api.entity.FirefightersContract;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yeejoin.amos.boot.module.jcs.api.entity.FirefightersContract;
 
 /**
 * 消防员合同 Mapper 接口

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/mapper/FirefightersEducationMapper.java

 package com.yeejoin.amos.boot.module.jcs.api.mapper;
 
-import com.yeejoin.amos.boot.module.jcs.api.entity.FirefightersEducation;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yeejoin.amos.boot.module.jcs.api.entity.FirefightersEducation;
 
 /**
 * 人员学历 Mapper 接口

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/mapper/FirefightersJacketMapper.java

 package com.yeejoin.amos.boot.module.jcs.api.mapper;
 
-import com.yeejoin.amos.boot.module.jcs.api.entity.FirefightersJacket;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yeejoin.amos.boot.module.jcs.api.entity.FirefightersJacket;
 
 /**
 * 消防人员配装记录 Mapper 接口

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/mapper/FirefightersMapper.java

 package com.yeejoin.amos.boot.module.jcs.api.mapper;
 
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.yeejoin.amos.boot.module.jcs.api.entity.Firefighters;
 import com.yeejoin.amos.boot.module.jcs.api.vo.FirefightersListVo;
-
-import java.util.List;
-import java.util.Map;
-
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
 
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import java.util.List;
+import java.util.Map;
 
 /**
 * 消防队员 Mapper 接口

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/mapper/FirefightersPostMapper.java

 package com.yeejoin.amos.boot.module.jcs.api.mapper;
 
-import com.yeejoin.amos.boot.module.jcs.api.entity.FirefightersPost;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yeejoin.amos.boot.module.jcs.api.entity.FirefightersPost;
 
 /**
 * 岗位信息 Mapper 接口

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/mapper/FirefightersThoughtMapper.java

 package com.yeejoin.amos.boot.module.jcs.api.mapper;
 
-import com.yeejoin.amos.boot.module.jcs.api.entity.FirefightersThought;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yeejoin.amos.boot.module.jcs.api.entity.FirefightersThought;
 
 /**
 * 消防员思想谈话记录 Mapper 接口

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/mapper/FirefightersWorkexperienceMapper.java

 package com.yeejoin.amos.boot.module.jcs.api.mapper;
 
-import com.yeejoin.amos.boot.module.jcs.api.entity.FirefightersWorkexperience;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yeejoin.amos.boot.module.jcs.api.entity.FirefightersWorkexperience;
 
 /**
 * 工作经历 Mapper 接口

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/mapper/OrgUsrAuthMapper.java

 package com.yeejoin.amos.boot.module.jcs.api.mapper;
 
-import com.yeejoin.amos.boot.module.jcs.api.entity.OrgUsrAuth;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yeejoin.amos.boot.module.jcs.api.entity.OrgUsrAuth;
 
 /**
 *  Mapper 接口

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/mapper/OrgUsrMapper.java

 package com.yeejoin.amos.boot.module.jcs.api.mapper;
 
-import com.yeejoin.amos.boot.module.jcs.api.entity.OrgUsr;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yeejoin.amos.boot.module.jcs.api.entity.OrgUsr;
 
 /**
 * 机构/部门/人员表 Mapper 接口

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/mapper/PowerTransferCompanyMapper.java

 package com.yeejoin.amos.boot.module.jcs.api.mapper;
 
-import com.yeejoin.amos.boot.module.jcs.api.entity.PowerTransferCompany;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yeejoin.amos.boot.module.jcs.api.entity.PowerTransferCompany;
 
 /**
 * 调派单位 Mapper 接口

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/mapper/PowerTransferCompanyResourcesMapper.java

 package com.yeejoin.amos.boot.module.jcs.api.mapper;
 
-import com.yeejoin.amos.boot.module.jcs.api.entity.PowerTransferCompanyResources;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yeejoin.amos.boot.module.jcs.api.entity.PowerTransferCompanyResources;
 
 /**
 * 调派单位资源 Mapper 接口

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/mapper/PowerTransferMapper.java

 package com.yeejoin.amos.boot.module.jcs.api.mapper;
 
-import com.yeejoin.amos.boot.module.jcs.api.entity.PowerTransfer;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yeejoin.amos.boot.module.jcs.api.entity.PowerTransfer;
 import com.yeejoin.amos.boot.module.jcs.api.vo.PowerTransferCompanyResourcesVo;
-import com.yeejoin.amos.boot.module.jcs.api.vo.PowerTransferVo;
 
 import java.util.List;
 

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/mapper/TemplateMapper.java

 package com.yeejoin.amos.boot.module.jcs.api.mapper;
 
-import com.yeejoin.amos.boot.module.jcs.api.entity.Template;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yeejoin.amos.boot.module.jcs.api.entity.Template;
 
 /**
 * 模板表 Mapper 接口

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/service/IAlertCalledService.java

 package com.yeejoin.amos.boot.module.jcs.api.service;
 
-import com.yeejoin.amos.boot.module.jcs.api.entity.AlertCalled;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.yeejoin.amos.boot.module.jcs.api.entity.AlertCalled;
 
 /**
 * 警情接警记录 服务类

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/service/IAlertFormService.java

 package com.yeejoin.amos.boot.module.jcs.api.service;
 
-import com.yeejoin.amos.boot.module.jcs.api.entity.AlertForm;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.yeejoin.amos.boot.module.jcs.api.entity.AlertForm;
 
 /**
 * 警情表单 服务类

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/service/IAlertSubmittedObjectService.java

 package com.yeejoin.amos.boot.module.jcs.api.service;
 
-import com.yeejoin.amos.boot.module.jcs.api.entity.AlertSubmittedObject;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.yeejoin.amos.boot.module.jcs.api.entity.AlertSubmittedObject;
 
 /**
 * 报送对象 服务类

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/service/IDataDictionaryService.java

 package com.yeejoin.amos.boot.module.jcs.api.service;
 
-import com.yeejoin.amos.boot.module.jcs.api.entity.DataDictionary;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.yeejoin.amos.boot.module.jcs.api.entity.DataDictionary;
 
 /**
 * 数据字典 服务类

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/service/IFireExpertsService.java

 package com.yeejoin.amos.boot.module.jcs.api.service;
 
-import com.yeejoin.amos.boot.module.jcs.api.entity.FireExperts;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.yeejoin.amos.boot.module.jcs.api.entity.FireExperts;
 
 /**
 *  服务类

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/service/IFireTeamService.java

 package com.yeejoin.amos.boot.module.jcs.api.service;
 
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.yeejoin.amos.boot.module.jcs.api.entity.FireTeam;
-import com.yeejoin.amos.boot.module.jcs.api.entity.Firefighters;
 import com.yeejoin.amos.boot.module.jcs.api.vo.FireTeamListVo;
 import com.yeejoin.amos.boot.module.jcs.api.vo.FireTeamVo;
-import com.yeejoin.amos.boot.module.jcs.api.vo.FirefightersListVo;
 
 import java.util.List;
 import java.util.Map;
 
-import com.baomidou.mybatisplus.extension.service.IService;
-
 /**
 * 消防队伍 服务类
 *

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/service/IFirefightersContactsService.java

 package com.yeejoin.amos.boot.module.jcs.api.service;
 
-import com.yeejoin.amos.boot.module.jcs.api.entity.FirefightersContacts;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.yeejoin.amos.boot.module.jcs.api.entity.FirefightersContacts;
 
 /**
 * l联系人 服务类

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/service/IFirefightersContractService.java

 package com.yeejoin.amos.boot.module.jcs.api.service;
 
-import com.yeejoin.amos.boot.module.jcs.api.entity.FirefightersContract;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.yeejoin.amos.boot.module.jcs.api.entity.FirefightersContract;
 
 /**
 * 消防员合同 服务类

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/service/IFirefightersEducationService.java

 package com.yeejoin.amos.boot.module.jcs.api.service;
 
-import com.yeejoin.amos.boot.module.jcs.api.entity.FirefightersEducation;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.yeejoin.amos.boot.module.jcs.api.entity.FirefightersEducation;
 
 /**
 * 人员学历 服务类

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/service/IFirefightersJacketService.java

 package com.yeejoin.amos.boot.module.jcs.api.service;
 
-import com.yeejoin.amos.boot.module.jcs.api.entity.FirefightersJacket;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.yeejoin.amos.boot.module.jcs.api.entity.FirefightersJacket;
 
 /**
 * 消防人员配装记录 服务类

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/service/IFirefightersPostService.java

 package com.yeejoin.amos.boot.module.jcs.api.service;
 
-import com.yeejoin.amos.boot.module.jcs.api.entity.FirefightersPost;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.yeejoin.amos.boot.module.jcs.api.entity.FirefightersPost;
 
 /**
 * 岗位信息 服务类

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/service/IFirefightersService.java

 package com.yeejoin.amos.boot.module.jcs.api.service;
 
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.yeejoin.amos.boot.module.jcs.api.entity.Firefighters;
 import com.yeejoin.amos.boot.module.jcs.api.vo.FirefightersListVo;
 
 import java.util.List;
 import java.util.Map;
 
-import com.baomidou.mybatisplus.extension.service.IService;
-
 /**
 * 消防队员 服务类
 *