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

puzhibing

2025-02-05 9ce27f53094be15ee2e69c0dce31e3f324bfda99

 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;
}