Merge remote-tracking branch 'origin/main-zhb'

# Conflicts: # mall-portal/src/main/java/com/buy507/mall/portal/service/impl/OmsPortalOrderServiceImpl.java
2025-02-20 11:23:07 +08:00
parent 0b4ce84d7f c572ec0f84
commit d1c461e02d
13 changed files with 514 additions and 188 deletions
--- a/mall-admin/src/main/java/com/buy507/mall/service/UmsMemberLevelService.java
+++ b/mall-admin/src/main/java/com/buy507/mall/service/UmsMemberLevelService.java
@@ -13,4 +13,6 @@ public interface UmsMemberLevelService {
     * @param defaultStatus 是否为默认会员
     */
    List<UmsMemberLevel> list(Integer defaultStatus);
+
+
 }