Merge remote-tracking branch 'origin/master' into xin

xin

2025-07-11 3caa0b05a620aa7714de0d63c804e43aa6486c9b

 oying-system/pom.xml

@@ -82,7 +82,7 @@

    <!-- 打包 -->
    <build>
        <finalName>oying-server</finalName>
        <finalName>oying</finalName>
        <plugins>
            <plugin>
                <groupId>org.springframework.boot</groupId>