Merge remote-tracking branch 'origin/master'

k94314517

2024-03-21 68ae0e6a2dc077d8b85187ee3dbee4b87a6c9b90

 server/dmvisit_admin/pom.xml

@@ -74,7 +74,7 @@
        </pluginManagement>
    </build>-->
    <build>
        <finalName>dmvisit_admin</finalName>
        <finalName>admin_interface</finalName>
        <resources>
            <resource>
                <directory>src/main/resources</directory>