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

# Conflicts: # src/main/java/com/ai/da/service/AccountService.java
2024-11-11 16:06:21 +08:00
parent 8c20b51e13 391a28d659
commit 37ff7fbb91
13 changed files with 129 additions and 43 deletions
--- a/src/main/java/com/ai/da/service/AccountService.java
+++ b/src/main/java/com/ai/da/service/AccountService.java
@@ -184,4 +184,6 @@ public interface AccountService extends IService<Account> {
    void halfPricePromotion();

    String googleCallback(String code, HttpSession session);
+
+    List<String> getPaidCustomerEmail();
 }