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

# Conflicts: # src/main/java/com/gxwebsoft/shop/entity/ShopCoupon.java
2025-08-12 00:02:14 +08:00
parent cce8c76c86 cfc0b3ff38
commit 28f927536c
47 changed files with 2576 additions and 579 deletions
@@ -370,7 +370,7 @@
        <configuration>
          <excludes>
            <exclude>
-              <groupId>org.projectlombok</groupId>
+              <groupId>org.project-lombok</groupId>
              <artifactId>lombok</artifactId>
            </exclude>
          </excludes>