Merge remote-tracking branch 'origin/master'

Fancy

2024-07-31 27c0c61e48bfb3e870d44b3b53a820568fcce5d5

 pms-parent/pms-web-other/pom.xml

@@ -53,7 +53,7 @@
                            <outputDirectory>${project.build.directory}/execute</outputDirectory>
                            <finalName>${artifactId}-${version}</finalName>
                            <layout>ZIP</layout>
                            <mainClass>com.dy.pmsBase.pmsWebBaseApplication</mainClass>
                            <mainClass>com.dy.pmsOther.PmsOtherApplication</mainClass>
                            <includes>
                                <include>
                                    <groupId>com.dy</groupId>
@@ -94,7 +94,7 @@
                            <stripVersion>false</stripVersion>
                            <finalName>${project.artifactId}-${project.version}</finalName>
                            <layout>ZIP</layout>
                            <mainClass>com.dy.pmsBase.PmsBaseApplication</mainClass>
                            <mainClass>com.dy.pmsOther.PmsOtherApplication</mainClass>
                            <includes>
                                <include>
                                    <groupId>com.dy</groupId>