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

rk

17 小时以前 3b11f53dfb46957720cb0395a3a549a119da2f05

 server/visits/dmvisit_admin/pom.xml

@@ -14,12 +14,23 @@
        <maven.compiler.target>8</maven.compiler.target>
        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
    </properties>

    <dependencies>
        <dependency>
            <groupId>com.doumee</groupId>
            <artifactId>dmvisit_service</artifactId>
            <version>1.0.0-SNAPSHOT</version>
            <exclusions>
                <exclusion>
                    <groupId>com.google.protobuf</groupId>
                    <artifactId>protobuf-java</artifactId>
                </exclusion>
            </exclusions>
        </dependency>
        <dependency>
            <groupId>com.google.protobuf</groupId>
            <artifactId>protobuf-java</artifactId>
            <version>4.31.1</version>
            <scope>compile</scope>
        </dependency>
    </dependencies>
    <build>
@@ -37,6 +48,32 @@
                    <fork>true</fork>
                    <mainClass>com.doumee.VisitsAdminApplication</mainClass>
                    <layout>ZIP</layout>
                    <requiresUnpack>
                        <dependency>
                            <groupId>com.google.ortools</groupId>
                            <artifactId>ortools-java</artifactId>
                        </dependency>
                        <dependency>
                            <groupId>com.google.ortools</groupId>
                            <artifactId>ortools-linux-x86-64</artifactId>
                        </dependency>
                        <dependency>
                            <groupId>com.google.ortools</groupId>
                            <artifactId>ortools-darwin-x86-64</artifactId>
                        </dependency>
                        <dependency>
                            <groupId>com.google.ortools</groupId>
                            <artifactId>ortools-win32-x86-64</artifactId>
                        </dependency>
                        <dependency>
                            <groupId>com.google.ortools</groupId>
                            <artifactId>ortools-linux-aarch64</artifactId>
                        </dependency>
                        <dependency>
                            <groupId>com.google.ortools</groupId>
                            <artifactId>ortools-darwin-aarch64</artifactId>
                        </dependency>
                    </requiresUnpack>
                </configuration>
                <executions>
                    <execution>