weiaisuosi/nanguangszwlback
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'wms_dev' into wms_dev_hbbf

Browse Source 
# Conflicts:
#	mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/UserServiceFeign.java
#	mhd_oms/pom.xml
This commit is contained in:
王奎兴
2026-02-09 14:29:47 +08:00
parent fa68e9dc0e 9cdb5a8896
commit 5d89fdc0a6
228 changed files with 17780 additions and 684 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mhd_oms/pom.xml
+2 -15
View File
@@ -90,7 +90,7 @@
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<version>1.18.38</version>
<version>1.18.30</version>
<scope>provided</scope>
</dependency>
<!--链路追踪-->
@@ -127,19 +127,6 @@
<groupId>com.mhd</groupId>
<artifactId>mhd-common-log</artifactId>
</dependency>
<!-- <dependency>-->
<!-- <groupId>com.mhd</groupId>-->
<!-- <artifactId>mhd-modules-system</artifactId>-->
<!-- <version>3.6.0</version>-->
<!-- <scope>compile</scope>-->
<!-- </dependency>-->
<dependency>
<groupId>com.mhd</groupId>
<artifactId>mhd-user-center</artifactId>
<version>3.6.0</version>
<scope>compile</scope>
</dependency>
</dependencies>
@@ -179,4 +166,4 @@
</build>
</profile>
</profiles>
</project>
</project>