提交bug修改

pom.xml

@@ -118,11 +118,6 @@
                     <!--包名-->
                     <targetPackage>com.steerinfo.dil</targetPackage>
                     <tables>
-<<<<<<< HEAD
-                            <param>RMS_CARRIER</param>
-=======
-                    <param>AMSTRUCK_RAIL_DAYPLAN</param>
->>>>>>> 0b57e356a096c2e66bd11b27fe835b9aa84fa261
                     </tables>
                 </configuration>
                 <executions>

src/main/java/com/steerinfo/dil/controller/OMSController.java

@@ -501,7 +501,7 @@ public class OMSController {
         return map;
     }
 
-    @ApiOperation(value="根据运单id关闭订单")
+    @ApiOperation(value="siji")
     @PostMapping("/getCapacityAndDriverList")
     public Map<String, Object> getCapacityAndDriverList(@RequestBody(required=false) Map<String,Object> mapValue,
                                                         Integer apiId,

src/main/resources/bootstrap.yml

@@ -80,5 +80,5 @@ mybatis:
     call-setters-on-nulls: true
 
 server:
-  port: 8080
+  port: 8099