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

jiangping

2025-02-08 75ac3d5acdd448f063a3c307b4c733e37b4fc04f

 server/zhubo/pom.xml

@@ -26,7 +26,7 @@
    </dependencies>

    <build>
        <finalName>company</finalName>
        <finalName>zhubo</finalName>
        <resources>
            <resource>
                <directory>src/main/resources</directory>