dg

pom.xml

@@ -111,11 +111,6 @@
                     <!--包名-->
                     <targetPackage>com.steerinfo.dil</targetPackage>
                     <tables>
-<<<<<<< Updated upstream
-                        <param>RMS_MATERIAL_STEEL</param><!--运力-->
-=======
-                        <param>TMSTRUCK_SMS_RUSULT</param><!--运力-->
->>>>>>> Stashed changes
                     </tables>
                 </configuration>
                 <executions>