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

# Conflicts:
#	src/main/java/com/gxwebsoft/shop/entity/ShopCoupon.java
This commit is contained in:
2025-08-12 00:02:14 +08:00
47 changed files with 2576 additions and 579 deletions

View File

@@ -370,7 +370,7 @@
<configuration>
<excludes>
<exclude>
<groupId>org.projectlombok</groupId>
<groupId>org.project-lombok</groupId>
<artifactId>lombok</artifactId>
</exclude>
</excludes>