Home Explore Help
Sign In
DAL-DAZHOU2
/
DAI_DAZHOU-OMS
5
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

'siji接单'

HUJIANGUO 3 years ago
parent
045b62f42e
commit
28a0c51cbc
1 changed files with 0 additions and 3 deletions
Unified View Show Diff Stats
  1. 0 3
      pom.xml

+ 0 - 3
pom.xml
View File 

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