@@ -111,11 +111,7 @@
<!--包名-->
<targetPackage>com.steerinfo.dil</targetPackage>
<tables>
-<<<<<<< HEAD
<param>RMS_CONSIGNEE</param>
-=======
- <param>RMS_SUPPLIER</param>
->>>>>>> a066ba4f44b52cc7f73aed5be8723cdf4c845a4d
</tables>
</configuration>
<executions>
