Merge branch 'master' of https://gitee.com/oracular-wind/pet-admin
# Conflicts:
# CatmDogd-Mall-Front-test/.env.development
# CatmDogd-Mall-Front-test/package.json
# ruoyi-catdog/src/main/java/com/ruoyi/applet/contoller/AppletExaminationController.java
# ruoyi-catdog/src/main/java/com/ruoyi/model/controller/AnswerController.java
# ruoyi-catdog/src/main/java/com/ruoyi/model/controller/AppInviteController.java
# ruoyi-catdog/src/main/java/com/ruoyi/model/controller/AppPartnerbindingController.java
# ruoyi-catdog/src/main/java/com/ruoyi/model/controller/AppPartnerdataController.java
# ruoyi-catdog/src/main/java/com/ruoyi/model/controller/CurrentConfigController.java
# ruoyi-catdog/src/main/java/com/ruoyi/model/controller/ExaminationController.java
# ruoyi-catdog/src/main/java/com/ruoyi/model/controller/ExamineConfigController.java
# ruoyi-catdog/src/main/java/com/ruoyi/model/controller/FinalConfigController.java
# ruoyi-catdog/src/main/java/com/ruoyi/model/controller/IndexPartnerConfigController.java
# ruoyi-catdog/src/main/java/com/ruoyi/model/controller/IndexconfigController.java
# ruoyi-catdog/src/main/java/com/ruoyi/model/controller/IndexconfigIconController.java
# ruoyi-catdog/src/main/java/com/ruoyi/model/controller/LicenseController.java
# ruoyi-catdog/src/main/java/com/ruoyi/model/controller/PetTypeController.java
# ruoyi-catdog/src/main/java/com/ruoyi/model/controller/ShortAnswerQuestionsController.java
# ruoyi-catdog/src/main/java/com/ruoyi/model/controller/TrainingController.java
# ruoyi-catdog/src/main/java/com/ruoyi/model/controller/TransactionDetailsController.java
# ruoyi-catdog/src/main/java/com/ruoyi/model/controller/UserBindingConfigController.java
# ruoyi-catdog/src/main/java/com/ruoyi/model/controller/WalletController.java
# ruoyi-catdog/src/main/java/com/ruoyi/model/controller/WithdrawalConfigController.java
# ruoyi-catdog/src/main/java/com/ruoyi/model/domain/Answer.java
# ruoyi-catdog/src/main/java/com/ruoyi/model/domain/AppInvite.java
# ruoyi-catdog/src/main/java/com/ruoyi/model/domain/AppPartnerbinding.java
# ruoyi-catdog/src/main/java/com/ruoyi/model/domain/AppPartnerdata.java
# ruoyi-catdog/src/main/java/com/ruoyi/model/domain/CurrentConfig.java
# ruoyi-catdog/src/main/java/com/ruoyi/model/domain/Examination.java
# ruoyi-catdog/src/main/java/com/ruoyi/model/domain/ExamineConfig.java
# ruoyi-catdog/src/main/java/com/ruoyi/model/domain/FinalConfig.java
# ruoyi-catdog/src/main/java/com/ruoyi/model/domain/IndexPartnerConfig.java
# ruoyi-catdog/src/main/java/com/ruoyi/model/domain/IndexconfigIcon.java
# ruoyi-catdog/src/main/java/com/ruoyi/model/domain/License.java
# ruoyi-catdog/src/main/java/com/ruoyi/model/domain/PetType.java
# ruoyi-catdog/src/main/java/com/ruoyi/model/domain/ShortAnswerQuestions.java
# ruoyi-catdog/src/main/java/com/ruoyi/model/domain/Training.java
# ruoyi-catdog/src/main/java/com/ruoyi/model/domain/TransactionDetails.java
# ruoyi-catdog/src/main/java/com/ruoyi/model/domain/UserBindingConfig.java
# ruoyi-catdog/src/main/java/com/ruoyi/model/domain/Wallet.java
# ruoyi-catdog/src/main/java/com/ruoyi/model/domain/WithdrawalConfig.java
# ruoyi-catdog/src/main/java/com/ruoyi/model/mapper/AnswerMapper.java
# ruoyi-catdog/src/main/java/com/ruoyi/model/mapper/AppInviteMapper.java
# ruoyi-catdog/src/main/java/com/ruoyi/model/mapper/AppPartnerdataMapper.java
# ruoyi-catdog/src/main/java/com/ruoyi/model/mapper/CurrentConfigMapper.java
# ruoyi-catdog/src/main/java/com/ruoyi/model/mapper/ExaminationMapper.java
# ruoyi-catdog/src/main/java/com/ruoyi/model/mapper/ExamineConfigMapper.java
# ruoyi-catdog/src/main/java/com/ruoyi/model/mapper/FinalConfigMapper.java
# ruoyi-catdog/src/main/java/com/ruoyi/model/mapper/IndexPartnerConfigMapper.java
# ruoyi-catdog/src/main/java/com/ruoyi/model/mapper/IndexconfigIconMapper.java
# ruoyi-catdog/src/main/java/com/ruoyi/model/mapper/LicenseMapper.java
# ruoyi-catdog/src/main/java/com/ruoyi/model/mapper/PetTypeMapper.java
# ruoyi-catdog/src/main/java/com/ruoyi/model/mapper/ShortAnswerQuestionsMapper.java
# ruoyi-catdog/src/main/java/com/ruoyi/model/mapper/TrainingMapper.java
# ruoyi-catdog/src/main/java/com/ruoyi/model/mapper/TransactionDetailsMapper.java
# ruoyi-catdog/src/main/java/com/ruoyi/model/mapper/UserBindingConfigMapper.java
# ruoyi-catdog/src/main/java/com/ruoyi/model/mapper/WalletMapper.java
# ruoyi-catdog/src/main/java/com/ruoyi/model/mapper/WithdrawalConfigMapper.java
# ruoyi-catdog/src/main/java/com/ruoyi/model/service/IAnswerService.java
# ruoyi-catdog/src/main/java/com/ruoyi/model/service/IAppInviteService.java
# ruoyi-catdog/src/main/java/com/ruoyi/model/service/IAppPartnerbindingService.java
# ruoyi-catdog/src/main/java/com/ruoyi/model/service/IAppPartnerdataService.java
# ruoyi-catdog/src/main/java/com/ruoyi/model/service/ICurrentConfigService.java
# ruoyi-catdog/src/main/java/com/ruoyi/model/service/IExaminationService.java
# ruoyi-catdog/src/main/java/com/ruoyi/model/service/IExamineConfigService.java
# ruoyi-catdog/src/main/java/com/ruoyi/model/service/IFinalConfigService.java
# ruoyi-catdog/src/main/java/com/ruoyi/model/service/IIndexPartnerConfigService.java
# ruoyi-catdog/src/main/java/com/ruoyi/model/service/IIndexconfigIconService.java
# ruoyi-catdog/src/main/java/com/ruoyi/model/service/ILicenseService.java
# ruoyi-catdog/src/main/java/com/ruoyi/model/service/IPetTypeService.java
# ruoyi-catdog/src/main/java/com/ruoyi/model/service/IShortAnswerQuestionsService.java
# ruoyi-catdog/src/main/java/com/ruoyi/model/service/ITrainingService.java
# ruoyi-catdog/src/main/java/com/ruoyi/model/service/ITransactionDetailsService.java
# ruoyi-catdog/src/main/java/com/ruoyi/model/service/IWalletService.java
# ruoyi-catdog/src/main/java/com/ruoyi/model/service/IWithdrawalConfigService.java
# ruoyi-catdog/src/main/java/com/ruoyi/model/service/impl/AnswerServiceImpl.java
# ruoyi-catdog/src/main/java/com/ruoyi/model/service/impl/CurrentConfigServiceImpl.java
# ruoyi-catdog/src/main/java/com/ruoyi/model/service/impl/ExaminationServiceImpl.java
# ruoyi-catdog/src/main/java/com/ruoyi/model/service/impl/ExamineConfigServiceImpl.java
# ruoyi-catdog/src/main/java/com/ruoyi/model/service/impl/FinalConfigServiceImpl.java
# ruoyi-catdog/src/main/java/com/ruoyi/model/service/impl/IndexPartnerConfigServiceImpl.java
# ruoyi-catdog/src/main/java/com/ruoyi/model/service/impl/IndexconfigIconServiceImpl.java
# ruoyi-catdog/src/main/java/com/ruoyi/model/service/impl/LicenseServiceImpl.java
# ruoyi-catdog/src/main/java/com/ruoyi/model/service/impl/PetTypeServiceImpl.java
# ruoyi-catdog/src/main/java/com/ruoyi/model/service/impl/ShortAnswerQuestionsServiceImpl.java
# ruoyi-catdog/src/main/java/com/ruoyi/model/service/impl/TrainingServiceImpl.java
# ruoyi-catdog/src/main/java/com/ruoyi/model/service/impl/TransactionDetailsServiceImpl.java
# ruoyi-catdog/src/main/java/com/ruoyi/model/service/impl/UserBindingConfigServiceImpl.java
# ruoyi-catdog/src/main/java/com/ruoyi/model/service/impl/WalletServiceImpl.java
# ruoyi-catdog/src/main/java/com/ruoyi/model/service/impl/WithdrawalConfigServiceImpl.java
# ruoyi-catdog/src/main/resources/mapper/model/AnswerMapper.xml
# ruoyi-catdog/src/main/resources/mapper/model/AppInviteMapper.xml
# ruoyi-catdog/src/main/resources/mapper/model/CurrentConfigMapper.xml
# ruoyi-catdog/src/main/resources/mapper/model/ExaminationMapper.xml
# ruoyi-catdog/src/main/resources/mapper/model/ExamineConfigMapper.xml
# ruoyi-catdog/src/main/resources/mapper/model/FinalConfigMapper.xml
# ruoyi-catdog/src/main/resources/mapper/model/IndexPartnerConfigMapper.xml
# ruoyi-catdog/src/main/resources/mapper/model/IndexconfigIconMapper.xml
# ruoyi-catdog/src/main/resources/mapper/model/LicenseMapper.xml
# ruoyi-catdog/src/main/resources/mapper/model/PetTypeMapper.xml
# ruoyi-catdog/src/main/resources/mapper/model/ShortAnswerQuestionsMapper.xml
# ruoyi-catdog/src/main/resources/mapper/model/TrainingMapper.xml
# ruoyi-catdog/src/main/resources/mapper/model/TransactionDetailsMapper.xml
# ruoyi-catdog/src/main/resources/mapper/model/UserBindingConfigMapper.xml
# ruoyi-catdog/src/main/resources/mapper/model/WalletMapper.xml
# ruoyi-catdog/src/main/resources/mapper/model/WithdrawalConfigMapper.xml
|
CYF
cc
主管理员
Augcl