Merge branch 'master' into xin

xin

2025-08-25 dc3a923dcf09ba9ae0e46fa0916ac70d258d7b70

 oying-system/src/main/java/com/oying/modules/message/service/impl/MesMsgRecordServiceImpl.java

@@ -266,10 +266,8 @@
                (content != OrderStatusEnum.RIDER_PENDING_ACCEPTANCE &&
                        content != OrderStatusEnum.RIDER_PICKED_UP &&
                        content != OrderStatusEnum.RIDER_ARRIVED &&
                        content != OrderStatusEnum.RIDER_ORDER_CANCELLED &&
                        content != OrderStatusEnum.RIDER_DELIVERY_WARNING_1H &&
                        content != OrderStatusEnum.RIDER_DELIVERY_WARNING_30MIN)) {
            throw new IllegalArgumentException("content只能为  \"骑手已接单\" \"骑手已取货\" \"骑手已到店\" \"订单已取消\" \"距离最晚送达时间不足1小时\" \"距离最晚送达时间不足30分钟\"");
                        content != OrderStatusEnum.RIDER_ORDER_CANCELLED && content != OrderStatusEnum.RIDER_DELIVERY_WARNING)) {
            throw new IllegalArgumentException("content只能为  \"骑手已接单\" \"骑手已取货\" \"骑手已到店\" \"订单已取消\" \"订单已超时\" ");
        }
        MesMsgRecord record = new MesMsgRecord();
        record.setOrderNo(orderNo);