ams修改

pom.xml

@@ -118,11 +118,7 @@
                     <!--包名-->
                     <targetPackage>com.steerinfo.dil</targetPackage>
                     <tables>
-<<<<<<< HEAD
-                                                <param>ams_requirement</param><!--运力-->
-=======
-<!--                        <param>AMSTRUCK_RAIL_DAYPLAN</param>&lt;!&ndash;运力&ndash;&gt;-->
->>>>>>> bcea3dc53173008a1186762ddc0d8673345eefa7
+                    <param>AMSTRUCK_RAIL_DAYPLAN</param>
                     </tables>
                 </configuration>
                 <executions>

src/main/resources/bootstrap.yml

@@ -51,7 +51,6 @@ openfeign:
   RmsFeign:
     url: ${RMSFEIGN_HRL:localhost:8060}
 
-
 genxml:
   pth: com/a
 cache:
@@ -81,5 +80,5 @@ mybatis:
     call-setters-on-nulls: true
 
 server:
-  port: 8099
+  port: 8080