手动解决分支合并冲突

YeeAmosFireAutoSysCommon/src/main/java/com/yeejoin/amos/fas/dao/entity/Equipment.java

@@ -9,7 +9,7 @@ import java.util.Date;
 
 /**
  * The persistent class for the equipment database table.
- * 
+ *
  */
 @Entity
 @Table(name="f_equipment")
@@ -31,12 +31,12 @@ public class Equipment extends BasicEntity  {
 	 * 3维坐标
 	 */
 	private String position3d;
-	
+
 	/**
 	 * 3维楼层
 	 */
 	private String floor3d;
-	
+
 	/**
 	 * 预案配置
 	 */
@@ -102,14 +102,14 @@ public class Equipment extends BasicEntity  {
 	}
 
 	private String room;
-	
+
 	/**
 	 * 关联消防小室id
 	 */
 	@Column(name="fire_station_id")
 	private Long fireStationId;
 
-	
+
 
 	@Column(name="create_by")
 	private String createBy;
@@ -155,12 +155,6 @@ public class Equipment extends BasicEntity  {
 	@Column(name="reserve_source")
 	private Integer reserveSource;
 
-	/**
-	 * 分类
-	 */
-	@Column(name="category")
-	private String category;
-
 	public Equipment() {
 	}
 
@@ -188,7 +182,7 @@ public class Equipment extends BasicEntity  {
 		this.riskSourceId = riskSourceId;
 	}
 
-	
+
 
 	public String getChargeDeptId() {
 		return chargeDeptId;
@@ -260,7 +254,7 @@ public class Equipment extends BasicEntity  {
 	public void setRoom(String room) {
 		this.room = room;
 	}
-	
+
 	public String getReservePlan() {
 		return reservePlan;
 	}

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/service/impl/ContingencyPlanServiceImpl.java

@@ -694,8 +694,6 @@ public class ContingencyPlanServiceImpl implements IContingencyPlanService {
     public Page<PlanDetailVo> pageFilter(Page page, String planName, Long
             classifyId, List<String> planRange, String editOrgName, Date implementationTimeLeft, Date
                                                  implementationTimeRight, String equipmentId, String category) {
-                                                 implementationTimeRight,
-                                         String equipmentId, String category) {
         List<Long> classifyIdList = new ArrayList<>();
         if (classifyId != null) {
             Collection<PlanClassifyTreeVo> classifyTreeList = planClassifyTreeService.getAllChildIncludeMe(classifyId);

pom.xml

@@ -233,12 +233,12 @@
 	  <repository>
 		  <id>Releases</id>
 		  <name>Releases</name>
-		  <url>http://113.142.68.105:8081/nexus/content/repositories/releases/</url>
+		  <url>http://47.92.103.240:8081/nexus/content/repositories/releases/</url>
 	  </repository>
 	  <repository>
 		  <id>Snapshots</id>
 		  <name>Snapshots</name>
-		  <url>http://113.142.68.105:8081/nexus/content/repositories/snapshots/</url>
+		  <url>http://47.92.103.240:8081/nexus/content/repositories/snapshots/</url>
 	  </repository>
 <!--	<repository>-->
 <!--		<id>maven-public-ty</id>-->
@@ -256,7 +256,7 @@
     <pluginRepository>
       <id>public</id>
       <name>Public Repositories</name>
-      <url>http://113.142.68.105:8081/nexus/content/groups/public/</url>
+      <url>http://47.92.103.240:8081/nexus/content/groups/public/</url>
     </pluginRepository>
 
   </pluginRepositories>