增加序列化

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

@@ -3,6 +3,7 @@ package com.yeejoin.amos.boot.module.jcs.api.dto;
 import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 
 /**
  * @Author: xl
@@ -10,6 +11,7 @@ import lombok.Data;
  * @Date: 2021/6/23 11:29
  */
 @Data
+@EqualsAndHashCode(callSuper = true)
 public class EquipSpecificDto extends BaseEntity {
     private static final long serialVersionUID = 1L;
 
@@ -32,6 +34,6 @@ public class EquipSpecificDto extends BaseEntity {
     /**
      * 分页
      */
-    private Page page;
+    private Page<?> page;
 
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/dto/TemplateExtendDto.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;
+import lombok.EqualsAndHashCode;
 
 /**
  * 模板表扩展dto
@@ -12,6 +12,7 @@ import lombok.Data;
  * @date 2021-06-17
  */
 @Data
+@EqualsAndHashCode(callSuper = true)
 @ApiModel(value = "TemplateExtendDto", description = "模板表扩展dto")
 public class TemplateExtendDto extends TemplateDto {
     private static final long serialVersionUID = 1L;

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

@@ -22,7 +22,12 @@ import java.util.Date;
 @TableName("jc_alert_called")
 @ApiModel(value="AlertCalled对象", description="警情接警记录")
 public class AlertCalled extends BaseEntity {
-    @ApiModelProperty(value = "警情状态")
+    /**
+	 * 
+	 */
+	private static final long serialVersionUID = 1L;
+
+	@ApiModelProperty(value = "警情状态")
     private Boolean alertStatus;
 
     @ApiModelProperty(value = "系统/人工")

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

@@ -20,7 +20,12 @@ import lombok.experimental.Accessors;
 @ApiModel(value="AlertForm对象", description="警情表单")
 public class AlertForm extends BaseEntity {
 
-    @ApiModelProperty(value = "警情类型")
+    /**
+	 * 
+	 */
+	private static final long serialVersionUID = 1L;
+
+	@ApiModelProperty(value = "警情类型")
     private String alertTypeCode;
 
     @ApiModelProperty(value = "字段名称")

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

@@ -19,11 +19,12 @@ import lombok.experimental.Accessors;
 @TableName("jc_alert_form_type")
 @ApiModel(value="AlertFormType对象", description="动态表单类型")
 public class AlertFormType extends BaseEntity {
+    /**
+	 * 
+	 */
+	private static final long serialVersionUID = 1L;
 
-  
-
-
-    @ApiModelProperty(value = "表单类型code")
+	@ApiModelProperty(value = "表单类型code")
     private String alertTypeCode;
 
     @ApiModelProperty(value = "类型名称")

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

@@ -19,7 +19,12 @@ import lombok.experimental.Accessors;
 @TableName("jc_alert_form_value")
 @ApiModel(value="AlertFormValue对象", description="")
 public class AlertFormValue extends BaseEntity {
-    @ApiModelProperty(value = "表单id")
+    /**
+	 * 
+	 */
+	private static final long serialVersionUID = 1L;
+
+	@ApiModelProperty(value = "表单id")
     private Long alertFormId;
 
     @ApiModelProperty(value = "警情id")

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

@@ -21,11 +21,12 @@ import java.util.Date;
 @TableName("jc_alert_submitted")
 @ApiModel(value="AlertSubmitted对象", description="警情报送记录")
 public class AlertSubmitted extends BaseEntity {
+    /**
+	 * 
+	 */
+	private static final long serialVersionUID = 1L;
 
-   
-
-
-    @ApiModelProperty(value = "警情id")
+	@ApiModelProperty(value = "警情id")
     private Long alertCalledId;
 
     @ApiModelProperty(value = "业务类型(警情续报、非警情确认、警情结案)")

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

@@ -19,11 +19,12 @@ import lombok.experimental.Accessors;
 @TableName("jc_alert_submitted_object")
 @ApiModel(value="AlertSubmittedObject对象", description="报送对象")
 public class AlertSubmittedObject extends BaseEntity {
+    /**
+	 * 
+	 */
+	private static final long serialVersionUID = 1L;
 
-   
-
-
-    @ApiModelProperty(value = "报送单据id")
+	@ApiModelProperty(value = "报送单据id")
     private Long alertSubmittedId;
 
     @ApiModelProperty(value = "0人员1队伍")

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

@@ -19,7 +19,12 @@ import lombok.experimental.Accessors;
 @TableName("cb_data_dictionary")
 @ApiModel(value="DataDictionary对象", description="数据字典")
 public class DataDictionary extends BaseEntity {
-    @ApiModelProperty(value = "code")
+    /**
+	 * 
+	 */
+	private static final long serialVersionUID = 1L;
+
+	@ApiModelProperty(value = "code")
     private String code;
 
     @ApiModelProperty(value = "名称")

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

@@ -23,11 +23,12 @@ import java.util.Date;
 @TableName("cb_fire_experts")
 @ApiModel(value="FireExperts对象", description="")
 public class FireExperts extends BaseEntity {
+    /**
+	 * 
+	 */
+	private static final long serialVersionUID = 1L;
 
-  
-
-
-    @ApiModelProperty(value = "姓名")
+	@ApiModelProperty(value = "姓名")
     private String name;
 
     @ApiModelProperty(value = "证件类型")

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

@@ -23,11 +23,12 @@ import java.util.Date;
 @TableName("cb_fire_team")
 @ApiModel(value="FireTeam对象", description="消防队伍")
 public class FireTeam extends BaseEntity {
+    /**
+	 * 
+	 */
+	private static final long serialVersionUID = 1L;
 
-   
-
-
-    @ApiModelProperty(value = "消防队伍图片")
+	@ApiModelProperty(value = "消防队伍图片")
     private String img;
 
     @ApiModelProperty(value = "单位名称")

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

@@ -23,10 +23,12 @@ import java.util.Date;
 @TableName("cb_firefighters")
 @ApiModel(value="Firefighters对象", description="消防队员")
 public class Firefighters extends BaseEntity {
+    /**
+	 * 
+	 */
+	private static final long serialVersionUID = 1L;
 
-   
-
-    @ApiModelProperty(value = "系统账号")
+	@ApiModelProperty(value = "系统账号")
     private String systemAccount;
 
     @ApiModelProperty(value = "员工编码")

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

@@ -23,11 +23,12 @@ import java.util.Date;
 @TableName("cb_firefighters_contacts")
 @ApiModel(value="FirefightersContacts对象", description="联系人")
 public class FirefightersContacts extends BaseEntity {
+    /**
+	 * 
+	 */
+	private static final long serialVersionUID = 1L;
 
-    
-
-
-    @ApiModelProperty(value = "人员id")
+	@ApiModelProperty(value = "人员id")
     private Long firefightersId;
 
     @ApiModelProperty(value = "紧急联系人姓名")

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

@@ -24,11 +24,12 @@ import java.util.Date;
 @TableName("cb_firefighters_contract")
 @ApiModel(value="FirefightersContract对象", description="消防员合同")
 public class FirefightersContract extends BaseEntity {
+    /**
+	 * 
+	 */
+	private static final long serialVersionUID = 1L;
 
-    
-
-
-    @ApiModelProperty(value = "合同名称")
+	@ApiModelProperty(value = "合同名称")
     private String name;
 
     @ApiModelProperty(value = "甲方")

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

@@ -23,11 +23,12 @@ import java.util.Date;
 @TableName("cb_firefighters_education")
 @ApiModel(value="FirefightersEducation对象", description="人员学历")
 public class FirefightersEducation extends BaseEntity {
+    /**
+	 * 
+	 */
+	private static final long serialVersionUID = 1L;
 
-  
-
-
-    @ApiModelProperty(value = "人员id")
+	@ApiModelProperty(value = "人员id")
     private Long firefightersId;
 
     @ApiModelProperty(value = "第一学历")

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

@@ -24,11 +24,12 @@ import java.util.Date;
 @TableName("jc_firefighters_jacket")
 @ApiModel(value="FirefightersJacket对象", description="消防人员配装记录")
 public class FirefightersJacket extends BaseEntity {
+    /**
+	 * 
+	 */
+	private static final long serialVersionUID = 1L;
 
-  
-
-
-    @ApiModelProperty(value = "消防队员")
+	@ApiModelProperty(value = "消防队员")
     private Long firefightersId;
 
     @ApiModelProperty(value = "装备id")

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

@@ -23,11 +23,12 @@ import java.util.Date;
 @TableName("cb_firefighters_post")
 @ApiModel(value="FirefightersPost对象", description="岗位信息")
 public class FirefightersPost extends BaseEntity {
+    /**
+	 * 
+	 */
+	private static final long serialVersionUID = 1L;
 
-  
-
-
-    @ApiModelProperty(value = "人员id")
+	@ApiModelProperty(value = "人员id")
     private Long firefightersId;
 
     @ApiModelProperty(value = "员工层级")

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

@@ -24,11 +24,11 @@ import java.util.Date;
 @TableName("cb_firefighters_thought")
 @ApiModel(value="FirefightersThought对象", description="消防员思想谈话记录")
 public class FirefightersThought extends BaseEntity {
-
-  
-
-
-    @ApiModelProperty(value = "消防救援人员")
+    /**
+	 * 
+	 */
+	private static final long serialVersionUID = 1L;
+	@ApiModelProperty(value = "消防救援人员")
     private Long firefightersId;
     @DateTimeFormat(pattern = "yyyy-MM-dd")
     @ApiModelProperty(value = "谈话时间")

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

@@ -23,11 +23,12 @@ import java.util.Date;
 @TableName("cb_firefighters_workexperience")
 @ApiModel(value="FirefightersWorkexperience对象", description="工作经历")
 public class FirefightersWorkexperience extends BaseEntity {
+    /**
+	 * 
+	 */
+	private static final long serialVersionUID = 1L;
 
-   
-
-
-    @ApiModelProperty(value = "参加工作时间")
+	@ApiModelProperty(value = "参加工作时间")
     private Date workingHours;
 
     @ApiModelProperty(value = "参加消防部门工作时间")

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

@@ -4,14 +4,13 @@ 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 java.io.Serializable;
-
 /**
 * 机构/部门/人员表
 *
@@ -23,9 +22,13 @@ import java.io.Serializable;
 @Accessors(chain = true)
 @TableName("cb_org_usr")
 @ApiModel(value="OrgUsr对象", description="部门信息")
-public class OrgUsr extends BaseEntity implements Serializable {
+public class OrgUsr extends BaseEntity {
+    /**
+	 * 
+	 */
+	private static final long serialVersionUID = 1L;
 
-    @ApiModelProperty(value = "机构/部门名称")
+	@ApiModelProperty(value = "机构/部门名称")
     private String bizOrgName;
 
     @ApiModelProperty(value = "机构编码")

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

@@ -18,11 +18,12 @@ import lombok.experimental.Accessors;
 @TableName("cb_org_usr_auth")
 @ApiModel(value="OrgUsrAuth对象", description="")
 public class OrgUsrAuth extends BaseEntity {
+    /**
+	 * 
+	 */
+	private static final long serialVersionUID = 1L;
 
-   
-
-
-    private String recUserName;
+	private String recUserName;
 
     private String sourceId;
 

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

@@ -22,11 +22,12 @@ import lombok.experimental.Accessors;
 @TableName("jc_power_transfer")
 @ApiModel(value="PowerTransfer对象", description="力量调派")
 public class PowerTransfer extends BaseEntity {
+    /**
+	 * 
+	 */
+	private static final long serialVersionUID = 1L;
 
-   
-
-
-    @ApiModelProperty(value = "警情id")
+	@ApiModelProperty(value = "警情id")
     private Long alertCalledId;
 
     @ApiModelProperty(value = "调派单号")

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

@@ -21,11 +21,12 @@ import lombok.experimental.Accessors;
 @TableName("jc_power_transfer_company")
 @ApiModel(value="PowerTransferCompany对象", description="调派单位")
 public class PowerTransferCompany extends BaseEntity {
+    /**
+	 * 
+	 */
+	private static final long serialVersionUID = 1L;
 
-    
-
-
-    @ApiModelProperty(value = "调派单据id")
+	@ApiModelProperty(value = "调派单据id")
     private Long powerTransferId;
 
     @ApiModelProperty(value = "是否只派发机构")

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

@@ -21,11 +21,12 @@ import lombok.experimental.Accessors;
 @TableName("jc_power_transfer_company_resources")
 @ApiModel(value="PowerTransferCompanyResources对象", description="调派单位资源")
 public class PowerTransferCompanyResources extends BaseEntity {
+    /**
+	 * 
+	 */
+	private static final long serialVersionUID = 1L;
 
-   
-
-
-    @ApiModelProperty(value = "资源类型")
+	@ApiModelProperty(value = "资源类型")
     private String type;
 
     @ApiModelProperty(value = "资源id")

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

@@ -19,8 +19,12 @@ import lombok.experimental.Accessors;
 @TableName("jc_template")
 @ApiModel(value="Template对象", description="模板表")
 public class Template extends BaseEntity {
+    /**
+	 * 
+	 */
+	private static final long serialVersionUID = 1L;
 
-    @ApiModelProperty(value = "模板类型code")
+	@ApiModelProperty(value = "模板类型code")
     private String typeCode;
 
     @ApiModelProperty(value = "模板类型")