解决合并冲突

amos-boot-module/amos-boot-module-api/amos-boot-module-equip-api/src/main/java/com/yeejoin/equipmanage/common/entity/CarProperty.java

@@ -62,21 +62,6 @@ public class CarProperty extends BaseEntity {
 	@TableField(exist = false)
 	private String nameKey;
 	
-	@ApiModelProperty(value = "十六进制颜色")
-    @TableField("color")
-    private String color;
-
-    @ApiModelProperty(value = "是否告警:0-否；1-是")
-    @TableField("is_alarm")
-    private Boolean isAlarm;
-
-    @ApiModelProperty(value = "紧急程度枚举（1：紧急，2：严重，3：轻微，4：正常，5：无效，6：备用，7：其他）")
-    @TableField("emergency_level")
-    private String emergencyLevel;
-    
-    @ApiModelProperty(value = "紧急程度描述")
-    @TableField("emergency_level_describe")
-    private String emergencyLevelDescribe;
 
 	/**
 	 * 颜色

amos-boot-module/amos-boot-module-api/amos-boot-module-equip-api/src/main/java/com/yeejoin/equipmanage/common/entity/EquipmentSpecificIndex.java

@@ -51,23 +51,6 @@ public class EquipmentSpecificIndex extends BaseEntity {
     @TableField("equipment_index_key")
     private String equipmentIndexKey;
     
-    @ApiModelProperty(value = "十六进制颜色")
-    @TableField("color")
-    private String color;
-
-    @ApiModelProperty(value = "是否告警:0-否；1-是")
-    @TableField("is_alarm")
-    private Boolean isAlarm;
-
-    @ApiModelProperty(value = "紧急程度枚举（1：紧急，2：严重，3：轻微，4：正常，5：无效，6：备用，7：其他）")
-    @TableField("emergency_level")
-    private String emergencyLevel;
-    
-    @ApiModelProperty(value = "紧急程度描述")
-    @TableField("emergency_level_describe")
-    private String emergencyLevelDescribe;
-
-
     @TableField(exist = false)
     private String nameKey;
 

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/controller/EquipmentIndexController.java

@@ -106,7 +106,6 @@ public class EquipmentIndexController {
         return true;
     }
 
-
     /**
      * 修改消防装备/消防车指标
      *

amos-boot-system-equip/src/main/resources/mapper/EquipmentSpecificIndexMapper.xml

@@ -59,7 +59,7 @@
 			wes.code as equipmentSpecificCode,
 			wes.system_id as systemId,
 			wesi.is_alarm as isAlarm,
-			wesi.color,
+			wesi.emergency_level_color as emergencyLevelColor,
 			wesi.emergency_level as emergencyLevel,
 			wesi.emergency_level_describe as emergencyLevelDescribe
         FROM