Merge branch 'dev' of https://git.steerinfo.com/DAL-DAZHOU/DAL-DAZHOU-API into dev

pom.xml

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

src/main/resources/bootstrap.yml

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