Merge remote-tracking branch 'origin/master'

xuhy

2024-10-18 b5a8762bf2c31c6465c721fa669fd807ffdbb5c2

 ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/rocket/base/BaseMessage.java

@@ -27,4 +27,9 @@
     * 重试次数，用于判断重试次数，超过重试次数发送异常警告
     */
    protected Integer retryTimes = 0;

    /**
     * 服务id
     */
    protected String serviceId;
}