xupei
94cf82340a
# Conflicts: # src/main/java/com/ai/da/common/config/MyTaskScheduler.java # src/main/java/com/ai/da/common/enums/ProductEnum.java # src/main/java/com/ai/da/common/task/PaymentTask.java # src/main/java/com/ai/da/common/utils/LocalCacheUtils.java # src/main/java/com/ai/da/common/utils/RedisUtil.java # src/main/java/com/ai/da/controller/AffiliateController.java # src/main/java/com/ai/da/controller/ConvenientInquiryController.java # src/main/java/com/ai/da/controller/StripeController.java # src/main/java/com/ai/da/mapper/primary/entity/Library.java # src/main/java/com/ai/da/mapper/primary/entity/ProductCoupons.java # src/main/java/com/ai/da/model/dto/CreateCouponDTO.java # src/main/java/com/ai/da/model/vo/CheckCouponsVO.java # src/main/java/com/ai/da/service/AffiliateService.java # src/main/java/com/ai/da/service/PaymentInfoService.java # src/main/java/com/ai/da/service/StripeService.java # src/main/java/com/ai/da/service/impl/AccountServiceImpl.java # src/main/java/com/ai/da/service/impl/AffiliateServiceImpl.java # src/main/java/com/ai/da/service/impl/CollectionElementServiceImpl.java # src/main/java/com/ai/da/service/impl/ConvenientInquiryServiceImpl.java # src/main/java/com/ai/da/service/impl/DesignItemServiceImpl.java # src/main/java/com/ai/da/service/impl/GenerateServiceImpl.java # src/main/java/com/ai/da/service/impl/PaymentInfoServiceImpl.java # src/main/java/com/ai/da/service/impl/StripeServiceImpl.java # src/main/java/com/ai/da/service/impl/UserLikeGroupServiceImpl.java # src/main/resources/messages_en.properties # src/main/resources/messages_zh.properties
Aida 1.2
Version of aida 1.3 修改预先登录接口、逻辑