Merge remote-tracking branch 'origin/dev' into dev

sckw-common/sckw-common-stream/src/main/java/com/sckw/stream/enums/MessageEnum.java

@@ -19,27 +19,27 @@ public enum MessageEnum {
     /**
      * 有新的待受理订单
      */
-    ORDER_NEW_PENDING("BUSINESS", "BUSINESS_TORDER_NEW_PENDING", "有新的待受理订单",
+    ORDER_NEW_PENDING("BUSINESS", "BUSINESS_ORDER_NEW_PENDING", "有新的待受理订单",
                                    "【${firmName}】发起采购申请，请及时进行受理；订单号：${orderNo}","terminal,ios,android"),
     /**
      * 发起代客下单
      */
-    ORDER_INITIATE_SALE("BUSINESS", "BUSINESS_TORDER_INITIATE_SALE", "发起代客下单",
+    ORDER_INITIATE_SALE("BUSINESS", "BUSINESS_ORDER_INITIATE_SALE", "发起代客下单",
                            "贵司已代【${firmName}】发起了商品采购，请及时联系往来单位；订单号：${orderNo}","terminal,ios,android"),
     /**
      * 有新的代客下单信息
      */
-    ORDER_NEW_VALET_MSG("BUSINESS", "BUSINESS_TORDER_NEW_VALET_MSG", "有新的代客下单信息",
+    ORDER_NEW_VALET_MSG("BUSINESS", "BUSINESS_ORDER_NEW_VALET_MSG", "有新的代客下单信息",
             "【${firmName}】代您发起了商品采购，请确认；订单号：${orderNo}","terminal,ios,android"),
     /**
      * 驳回采购订单
      */
-    ORDER_REJECT_VALET("BUSINESS", "BUSINESS_TORDER_REJECT_VALET", "驳回采购订单",
+    ORDER_REJECT_VALET("BUSINESS", "BUSINESS_ORDER_REJECT_VALET", "驳回采购订单",
             "贵司驳回了【${firmName}】的采购申请，请及时通知采购单位；订单号：${orderNo}","terminal,ios,android"),
     /**
      * 采购订单被驳回
      */
-    ORDER_REJECT_PURCHASE("BUSINESS", "BUSINESS_TORDER_REJECT_PURCHASE", "采购订单被驳回",
+    ORDER_REJECT_PURCHASE("BUSINESS", "BUSINESS_ORDER_REJECT_PURCHASE", "采购订单被驳回",
             "您的采购申请被【${firmName}】驳回，请及时查看；订单号：${orderNo}","terminal,ios,android"),
     /**
      * 司机拒绝接单