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

LiuHao

2024-03-08 598ece677dc38ccc4b8e63738e198b669ec05558

 ruoyi-common/ruoyi-common-mail/pom.xml

@@ -6,7 +6,6 @@
        <groupId>org.dromara</groupId>
        <artifactId>ruoyi-common</artifactId>
        <version>${revision}</version>
        <relativePath>../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>