Merge remote-tracking branch 'base-version/main' into dev

# Conflicts:
#	sql/mysql/ruoyi-vue-pro.sql
#	zt-module-infra/zt-module-infra-api/src/main/java/com/zt/plat/module/infra/api/websocket/WebSocketSenderApi.java
#	zt-module-infra/zt-module-infra-server/src/main/resources/application-dev.yaml

zt-framework/zt-spring-boot-starter-monitor/src/main/java/com/zt/plat/framework/tracer/config/ZtTracerAutoConfiguration.java

@@ -21,7 +21,7 @@ import org.springframework.context.annotation.Bean;
 @ConditionalOnProperty(prefix = "zt.tracer", value = "enable", matchIfMissing = true)
 public class ZtTracerAutoConfiguration {
 
-    // TODO @芋艿：重要。目前 opentracing 版本存在冲突，要么保证 skywalking，要么保证阿里云短信 sdk
+    // TODO @ZT：重要。目前 opentracing 版本存在冲突，要么保证 skywalking，要么保证阿里云短信 sdk
 //    @Bean
 //    public TracerProperties bizTracerProperties() {
 //        return new TracerProperties();

zt-framework/zt-spring-boot-starter-monitor/《芋道 Spring Boot 监控工具 Admin 入门》.md

@@ -1 +0,0 @@
-<https://www.iocoder.cn/Spring-Boot/Admin/?zt>

zt-framework/zt-spring-boot-starter-monitor/《芋道 Spring Boot 监控端点 Actuator 入门》.md

@@ -1 +0,0 @@
-<https://www.iocoder.cn/Spring-Boot/Actuator/?zt>

zt-framework/zt-spring-boot-starter-monitor/《芋道 Spring Boot 链路追踪 SkyWalking 入门》.md

@@ -1 +0,0 @@
-<http://www.iocoder.cn/Spring-Boot/SkyWalking/?zt>