【CHG】解决代码冲突问题

pom.xml

@@ -215,6 +215,13 @@
         <version>${railway.version}</version>
       </dependency>
 
+      <!-- 业务模块 -->
+      <dependency>
+        <groupId>com.railway</groupId>
+        <artifactId>railway-business</artifactId>
+        <version>${railway.version}</version>
+      </dependency>
+
     </dependencies>
   </dependencyManagement>
 

railway-admin/pom.xml

@@ -50,12 +50,6 @@
       <groupId>com.railway</groupId>
       <artifactId>railway-business</artifactId>
     </dependency>
-    <dependency>
-      <groupId>com.railway</groupId>
-      <artifactId>railway-business</artifactId>
-      <version>1.0.0</version>
-      <scope>compile</scope>
-    </dependency>
 
   </dependencies>
 

railway-admin/src/main/java/com/railway/web/controller/business/catenary/BusZzdzxxController.java

@@ -2,20 +2,23 @@ package com.railway.web.controller.business.catenary;
 
 import com.railway.business.catenary.domain.BusZzdzxx;
 import com.railway.business.catenary.service.IBusZzdzxxService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.ResponseEntity;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.web.bind.WebDataBinder;
 import com.railway.common.core.controller.BaseController;
 import com.railway.common.core.domain.AjaxResult;
 import com.railway.common.core.page.TableDataInfo;
-import javax.validation.Valid;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import java.util.List;
-
 import javax.validation.Valid;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
 
 @Api(value = "rest/business/bus/zzdzxx", tags = "支柱吊柱信息 row_format =")
 @RestController
@@ -26,7 +29,7 @@ public class BusZzdzxxController extends BaseController {
     private IBusZzdzxxService busZzdzxxService;
 
     @ApiOperation(value = "新增")
-    @PutMapping
+    @PutMapping("/add")
     public AjaxResult add(@Validated @RequestBody BusZzdzxx busZzdzxx) {
         return toAjax(busZzdzxxService.create(busZzdzxx));
     }
@@ -38,7 +41,7 @@ public class BusZzdzxxController extends BaseController {
     }
 
     @ApiOperation(value = "更新")
-    @PutMapping
+    @PutMapping("/update")
     public AjaxResult update(@RequestBody @Valid BusZzdzxx busZzdzxx) {
         return toAjax(busZzdzxxService.update(busZzdzxx));
     }

railway-admin/src/main/java/com/railway/web/controller/business/catenary/DemoController.java

@@ -1,5 +0,0 @@
-package com.railway.web.controller.business.catenary;
-
-public class DemoController {
-
-}

railway-business/src/main/java/com/railway/business/catenary/domain/BusZzdzxx.java

@@ -6,12 +6,14 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import java.util.Date;
 import javax.validation.constraints.NotNull;
+import lombok.EqualsAndHashCode;
 import org.hibernate.validator.constraints.Length;
 
 /**
  * 支柱吊柱信息
  * @author wuhonghao 2021-10-11
  */
+@EqualsAndHashCode(callSuper = true)
 @Data
 @ApiModel("支柱吊柱信息")
 public class BusZzdzxx extends BaseEntity{

railway-business/src/main/java/com/railway/business/catenary/domain/Demo.java

@@ -1,5 +0,0 @@
-package com.railway.business.catenary.domain;
-
-public class Demo {
-
-}

railway-business/src/main/java/com/railway/business/catenary/mapper/DemoMapper.java

@@ -1,5 +0,0 @@
-package com.railway.business.catenary.mapper;
-
-public class DemoMapper {
-
-}

railway-business/src/main/java/com/railway/business/catenary/service/DemoService.java

@@ -1,5 +0,0 @@
-package com.railway.business.catenary.service;
-
-public class DemoService {
-
-}

railway-business/src/main/java/com/railway/business/catenary/service/impl/DemoServiceImpl.java

@@ -1,5 +0,0 @@
-package com.railway.business.catenary.service.impl;
-
-public class DemoServiceImpl {
-
-}