解决冲突

pom.xml

@@ -5,7 +5,7 @@
 
     <modelVersion>4.0.0</modelVersion>
 
-    <groupId>com.wanji</groupId>
+    <groupId>net.wanji</groupId>
     <artifactId>traffic-signal-platform</artifactId>
     <version>1.1.0</version>
     <packaging>pom</packaging>

signal-utc-service/pom.xml

@@ -6,7 +6,7 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>com.wanji</groupId>
+        <groupId>net.wanji</groupId>
         <artifactId>traffic-signal-platform</artifactId>
         <version>1.1.0</version>
     </parent>

signal-utc-service/src/main/java/net/wanji/utc/common/baseentity/BaseCrossInfo.java

-package com.wanji.utc.common.baseentity;
+package net.wanji.utc.common.baseentity;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

signal-utc-service/src/main/java/net/wanji/utc/common/commonentity/Direction.java

-package com.wanji.utc.common.commonentity;
+package net.wanji.utc.common.commonentity;
 
 import lombok.Data;
 

signal-utc-service/src/main/java/net/wanji/utc/common/commonentity/Road.java

-package com.wanji.utc.common.commonentity;
+package net.wanji.utc.common.commonentity;
 
 import lombok.Data;
 

signal-utc-service/src/main/java/net/wanji/utc/common/constant/Constants.java

-package com.wanji.utc.common.constant;
+package net.wanji.utc.common.constant;
 
 public class Constants {
 

signal-utc-service/src/main/java/net/wanji/utc/common/genericentity/ManufacturerRes.java

-package com.wanji.utc.common.genericentity;
+package net.wanji.utc.common.genericentity;
 
 import lombok.Data;
 

signal-utc-service/src/main/java/net/wanji/utc/common/genericentity/OutVO.java

-package com.wanji.utc.common.genericentity;
+package net.wanji.utc.common.genericentity;
 
 import io.swagger.annotations.ApiModel;
 import lombok.Data;

signal-utc-service/src/main/java/net/wanji/utc/common/typeenum/BasicEnum.java

-package com.wanji.utc.common.typeenum;
+package net.wanji.utc.common.typeenum;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;

signal-utc-service/src/main/java/net/wanji/utc/controller/StaticInfoController.java

-package com.wanji.utc.controller;
+package net.wanji.utc.controller;
 
-import com.wanji.utc.common.constant.Constants;
-import com.wanji.utc.service.StaticInfoService;
-import com.wanji.utc.common.baseentity.BaseCrossInfo;
-import com.wanji.utc.vo.CrossInfoInVO;
-import com.wanji.utc.common.genericentity.OutVO;
+import net.wanji.utc.common.constant.Constants;
+import net.wanji.utc.service.StaticInfoService;
+import net.wanji.utc.common.baseentity.BaseCrossInfo;
+import net.wanji.utc.vo.CrossInfoInVO;
+import net.wanji.utc.common.genericentity.OutVO;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;

signal-utc-service/src/main/java/net/wanji/utc/po/CrossInfoPO.java

-package com.wanji.utc.po;
+package net.wanji.utc.po;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

signal-utc-service/src/main/java/net/wanji/utc/service/StaticInfoService.java

-package com.wanji.utc.service;
+package net.wanji.utc.service;
 
-import com.wanji.utc.common.baseentity.BaseCrossInfo;
-import com.wanji.utc.common.genericentity.OutVO;
+import net.wanji.utc.common.baseentity.BaseCrossInfo;
+import net.wanji.utc.common.genericentity.OutVO;
 
 public interface StaticInfoService {
 

signal-utc-service/src/main/java/net/wanji/utc/service/impl/StaticInfoServiceImpl.java

-package com.wanji.utc.service.impl;
+package net.wanji.utc.service.impl;
 
-import com.wanji.utc.common.genericentity.ManufacturerRes;
-import com.wanji.utc.common.typeenum.BasicEnum;
-import com.wanji.utc.po.CrossInfoPO;
-import com.wanji.utc.service.StaticInfoService;
-import com.wanji.utc.common.baseentity.BaseCrossInfo;
-import com.wanji.utc.common.genericentity.OutVO;
-import com.wanji.utc.vo.DetailCrossInfoVO;
+import net.wanji.utc.common.genericentity.ManufacturerRes;
+import net.wanji.utc.common.typeenum.BasicEnum;
+import net.wanji.utc.po.CrossInfoPO;
+import net.wanji.utc.service.StaticInfoService;
+import net.wanji.utc.common.baseentity.BaseCrossInfo;
+import net.wanji.utc.common.genericentity.OutVO;
+import net.wanji.utc.vo.DetailCrossInfoVO;
 import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;

signal-utc-service/src/main/java/net/wanji/utc/vo/CrossInfoInVO.java

-package com.wanji.utc.vo;
+package net.wanji.utc.vo;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

signal-utc-service/src/main/java/net/wanji/utc/vo/DetailCrossInfoVO.java

-package com.wanji.utc.vo;
+package net.wanji.utc.vo;
 
-import com.wanji.utc.common.baseentity.BaseCrossInfo;
-import com.wanji.utc.common.commonentity.Direction;
+import net.wanji.utc.common.baseentity.BaseCrossInfo;
+import net.wanji.utc.common.commonentity.Direction;
 import lombok.Data;
 import lombok.EqualsAndHashCode;