Merge branch 'dev' of https://git.steerinfo.com/DAL-DAZHOU2/DAI_DAZHOU-OMS into dev

pom.xml

@@ -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>

src/main/java/com/steerinfo/dil/service/impl/OmstruckOrderServiceImpl.java

@@ -460,7 +460,7 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
         Map<String, Object> mesMap = omstruckOrderMapper.pushMesToWebsocket(map);
         //添加消息实体
         HashMap<Object, Object> mapp = new HashMap<>();
-        mapp.put("messageType", 2);
+        mapp.put("messageType", 3);
         mapp.put("sendPerson", "system");
         mapp.put("receivePerson", mesMap.get("capacityNumber"));
         mapp.put("messageContent", mesMap);