@@ -109,11 +109,8 @@
<!--包名-->
<targetPackage>com.steerinfo.dil</targetPackage>
<tables>
-<<<<<<< HEAD
<param>AMSTRUCK_RAIL_DAYPLAN</param>
-=======
<param>RMS_DRIVER_CAPACITY</param>
->>>>>>> 03167ad19a5db67b367cf5f2937c5193cf5f9910
</tables>
</configuration>
<executions>